diff --git a/.cursor/rules/vars-usage.mdc b/.cursor/rules/vars-usage.mdc deleted file mode 100644 index 233e0aba..00000000 --- a/.cursor/rules/vars-usage.mdc +++ /dev/null @@ -1,18 +0,0 @@ ---- -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. - -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/.eslintrc.json b/.eslintrc.json index 63f6749a..3552f6a7 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -23,7 +23,6 @@ // ], "@stylistic/arrow-spacing": "error", "@stylistic/block-spacing": "error", - "@typescript-eslint/no-this-alias": "off", "@stylistic/brace-style": [ "error", "1tbs", diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index e80b7100..f913b9b6 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: 22 + node-version: 18 cache: "pnpm" - name: Move Cypress to dependencies run: | diff --git a/.github/workflows/build-single-file.yml b/.github/workflows/build-single-file.yml index 5f9800db..93b1b77f 100644 --- a/.github/workflows/build-single-file.yml +++ b/.github/workflows/build-single-file.yml @@ -23,8 +23,6 @@ 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 76ca65ca..cc472476 100644 --- a/.github/workflows/build-zip.yml +++ b/.github/workflows/build-zip.yml @@ -23,8 +23,6 @@ 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/ci.yml b/.github/workflows/ci.yml index 8fc56ea9..d624be53 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 @@ -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' diff --git a/.github/workflows/next-deploy.yml b/.github/workflows/next-deploy.yml index 75b39f6c..943727eb 100644 --- a/.github/workflows/next-deploy.yml +++ b/.github/workflows/next-deploy.yml @@ -36,7 +36,7 @@ jobs: run: vercel build --token=${{ secrets.VERCEL_TOKEN }} env: CONFIG_JSON_SOURCE: BUNDLED - LOCAL_CONFIG_FILE: config.mcraft-only.json + - run: pnpm build-storybook - name: Copy playground files run: | mkdir -p .vercel/output/static/playground diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 89fd6698..b4908d8d 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -1,4 +1,4 @@ -name: Vercel PR Deploy (Preview) +name: Vercel Deploy Preview env: VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }} @@ -78,7 +78,7 @@ jobs: run: vercel build --token=${{ secrets.VERCEL_TOKEN }} env: CONFIG_JSON_SOURCE: BUNDLED - LOCAL_CONFIG_FILE: config.mcraft-only.json + - 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/publish.yml similarity index 66% rename from .github/workflows/release.yml rename to .github/workflows/publish.yml index 3e8c4136..1294f9ff 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/publish.yml @@ -34,13 +34,17 @@ jobs: - run: vercel build --token=${{ secrets.VERCEL_TOKEN }} --prod env: CONFIG_JSON_SOURCE: BUNDLED - LOCAL_CONFIG_FILE: config.mcraft-only.json + - run: pnpm build-storybook - name: Copy playground files run: | mkdir -p .vercel/output/static/playground pnpm build-playground cp -r renderer/dist/* .vercel/output/static/playground/ - + - name: Deploy Project to Vercel + uses: mathiasvr/command-output@v2.0.0 + with: + run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }} --prod + id: deploy # publish to github - run: cp vercel.json .vercel/output/static/vercel.json - uses: peaceiris/actions-gh-pages@v3 @@ -49,39 +53,6 @@ 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: - personal_token: ${{ secrets.MCW_MCRAFT_PAGE_DEPLOY_TOKEN }} - external_repository: ${{ github.repository_owner }}/mwc-mcraft-pages - publish_dir: .vercel/output/static - publish_branch: main - destination_dir: docs - force_orphan: true - - - name: Change index.html title - run: | - # change Minecraft Web Client to Minecraft Web Client — Free Online Browser Version - sed -i 's/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: - 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 - 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 - - name: Build single-file version - minecraft.html run: pnpm build-single-file && mv dist/single/index.html minecraft.html - name: Build self-host version @@ -99,7 +70,7 @@ jobs: zip -r ../self-host.zip . - run: | - pnpx zardoy-release node --footer "This release URL: https://$(echo ${{ steps.alias.outputs.alias }} | cut -d',' -f1) (Vercel URL: ${{ steps.deploy.outputs.stdout }})" + pnpx zardoy-release node --footer "This release URL: ${{ steps.deploy.outputs.stdout }}" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # has possible output: tag diff --git a/.gitignore b/.gitignore index 33734572..bd774315 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,5 @@ generated storybook-static server-jar config.local.json -logs/ src/react/npmReactComponents.ts diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a5a3482d..06df61fa 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -177,13 +177,8 @@ New React components, improve UI (including mobile support). ## Updating Dependencies -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` - +1. Ensure mineflayer fork is up to date with the latest version of mineflayer original repo 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/README.MD b/README.MD index 018784e3..aa36f7e8 100644 --- a/README.MD +++ b/README.MD @@ -6,13 +6,9 @@ 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. -> For Turkey/Russia use [ru.mcraft.fun](https://ru.mcraft.fun/) (since Cloudflare is blocked) +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! -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). - -> **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) +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 @@ -32,31 +28,26 @@ 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://minimap.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://mcraft.fun/storybook) are published as npm module and can be used in other projects: [`minecraft-react`](https://npmjs.com/minecraft-react) ### Recommended Settings - 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) ### Browser Notes -This project is tested with BrowserStack. Special thanks to [BrowserStack](https://www.browserstack.com/) for providing testing infrastructure! - -Howerver, it's known that these browsers have issues: +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.5 are supported. +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 @@ -78,8 +69,6 @@ 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 @@ -127,12 +116,12 @@ 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: -- If you type `debugToggle`, press enter in console - It will enables all debug messages! Warning: this will start all packets spam. +- `localStorage.debug = '*'` - 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. -- `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. +- `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. - `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. @@ -141,7 +130,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 `world.getCameraPosition()` 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 `viewer.camera.position` to see the camera position and so on. <img src="./docs-assets/watch-expr.png" alt="Watch expression" width="480"/> @@ -178,7 +167,6 @@ 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: @@ -235,4 +223,3 @@ 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/TECH.md b/TECH.md index 2d15993a..c7f4ef4e 100644 --- a/TECH.md +++ b/TECH.md @@ -10,27 +10,26 @@ 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 | ✅(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) | +| 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 | +| 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/assets/customTextures/readme.md b/assets/customTextures/readme.md deleted file mode 100644 index e2a78c20..00000000 --- a/assets/customTextures/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -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/assets/debug-inputs.html b/assets/debug-inputs.html deleted file mode 100644 index 584fe4d7..00000000 --- a/assets/debug-inputs.html +++ /dev/null @@ -1,237 +0,0 @@ -<!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 - - - -
- -
- -
-
W
-
A
-
S
-
D
-
- -
-
Ctrl
-
- -
-
Space
-
- - - - diff --git a/config.json b/config.json index 2bfa9cfe..ea27ca5a 100644 --- a/config.json +++ b/config.json @@ -3,17 +3,12 @@ "defaultHost": "", "defaultProxy": "https://proxy.mcraft.fun", "mapsProvider": "https://maps.mcraft.fun/", - "skinTexturesProxy": "", "peerJsServer": "", "peerJsServerFallback": "https://p2p.mcraft.fun", "promoteServers": [ { "ip": "wss://play.mcraft.fun" }, - { - "ip": "wss://play.webmc.fun", - "name": "WebMC" - }, { "ip": "wss://ws.fuchsmc.net" }, @@ -21,8 +16,8 @@ "ip": "wss://play2.mcraft.fun" }, { - "ip": "wss://play-creative.mcraft.fun", - "description": "Might be available soon, stay tuned!" + "ip": "wss://mcraft.ryzyn.xyz", + "version": "1.19.4" }, { "ip": "kaboom.pw", @@ -31,8 +26,7 @@ } ], "rightSideText": "A Minecraft client clone in the browser!", - "splashText": "The sunset is coming!", - "splashTextFallback": "Welcome!", + "splashText": "Gen is cooking!", "pauseLinks": [ [ { @@ -42,39 +36,5 @@ "type": "discord" } ] - ], - "defaultUsername": "mcrafter{0-9999}", - "mobileButtons": [ - { - "action": "general.drop", - "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", - "label": "TAB" - }, - { - "action": "general.chat", - "actionHold": "", - "label": "" - }, - { - "action": "ui.pauseMenu", - "actionHold": "", - "label": "" - } ] } diff --git a/config.mcraft-only.json b/config.mcraft-only.json deleted file mode 100644 index 52a3aa2c..00000000 --- a/config.mcraft-only.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "alwaysReconnectButton": true, - "reportBugButtonWithReconnect": true, - "allowAutoConnect": true -} diff --git a/experiments/three-item.html b/experiments/three-item.html deleted file mode 100644 index 70155c50..00000000 --- a/experiments/three-item.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - Minecraft Item Viewer - - - - - - diff --git a/experiments/three-item.ts b/experiments/three-item.ts deleted file mode 100644 index b9d492fe..00000000 --- a/experiments/three-item.ts +++ /dev/null @@ -1,108 +0,0 @@ -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/experiments/three-labels.html b/experiments/three-labels.html deleted file mode 100644 index 2b25bc23..00000000 --- a/experiments/three-labels.html +++ /dev/null @@ -1,5 +0,0 @@ - - diff --git a/experiments/three-labels.ts b/experiments/three-labels.ts deleted file mode 100644 index b69dc95b..00000000 --- a/experiments/three-labels.ts +++ /dev/null @@ -1,67 +0,0 @@ -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/experiments/three.ts b/experiments/three.ts index 21142b5f..7a629a13 100644 --- a/experiments/three.ts +++ b/experiments/three.ts @@ -1,60 +1,101 @@ 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'; -// 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) -// Position camera -camera.position.z = 5 +const controls = new OrbitControls(camera, renderer.domElement) -// Create a canvas with some content -const canvas = document.createElement('canvas') -canvas.width = 256 -canvas.height = 256 -const ctx = canvas.getContext('2d') +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) -scene.background = new THREE.Color(0x444444) +// 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) -// 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) + new tweenJs.Tween(group.rotation).to({ z: THREE.MathUtils.degToRad(90) }, 1000).yoyo(true).repeat(Infinity).start() -// 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) +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) } 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((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/index.html b/index.html index b2fa3dbd..891aeff3 100644 --- a/index.html +++ b/index.html @@ -27,7 +27,6 @@
A true Minecraft client in your browser!
- ` @@ -37,13 +36,6 @@ 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 @@ -54,23 +46,12 @@ 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 && document.querySelector('.initial-loader').style.opacity !== 0) { - console.log('got worker') + if (window.navigator.serviceWorker) { window.navigator.serviceWorker.getRegistrations().then(registrations => { registrations.forEach(registration => { - console.log('got registration') - registration.unregister().then(() => { - console.log('worker unregistered') - }) + registration.unregister() }) }) } @@ -149,7 +130,7 @@ --> Minecraft Web Client - + diff --git a/package.json b/package.json index ff673726..9d776082 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,6 @@ "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,9 +31,7 @@ "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", - "update-git-deps": "tsx scripts/updateGitDeps.ts", - "request-data": "tsx scripts/requestData.ts" + "watch-playground": "rsbuild dev --config renderer/rsbuild.config.ts" }, "keywords": [ "prismarine", @@ -54,9 +51,8 @@ "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", + "@nxg-org/mineflayer-auto-jump": "^0.7.12", + "@nxg-org/mineflayer-tracker": "1.2.1", "@react-oauth/google": "^0.12.1", "@stylistic/eslint-plugin": "^2.6.1", "@types/gapi": "^0.0.47", @@ -80,14 +76,13 @@ "esbuild-plugin-polyfill-node": "^0.3.0", "express": "^4.18.2", "filesize": "^10.0.12", - "flying-squid": "npm:@zardoy/flying-squid@^0.0.104", - "framer-motion": "^12.9.2", + "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", "lodash-es": "^4.17.21", - "mcraft-fun-mineflayer": "^0.1.23", - "minecraft-data": "3.98.0", + "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", "mojangson": "^2.0.4", @@ -106,6 +101,7 @@ "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", @@ -135,6 +131,7 @@ "@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", @@ -144,7 +141,7 @@ "browserify-zlib": "^0.2.0", "buffer": "^6.0.3", "constants-browserify": "^1.0.0", - "contro-max": "^0.1.9", + "contro-max": "^0.1.8", "crypto-browserify": "^3.12.0", "cypress-esbuild-preprocessor": "^1.0.2", "eslint": "^8.50.0", @@ -154,10 +151,11 @@ "http-browserify": "^1.7.0", "http-server": "^14.1.1", "https-browserify": "^1.0.0", - "mc-assets": "^0.2.62", + "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.21", + "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", @@ -197,15 +195,14 @@ }, "pnpm": { "overrides": { - "mineflayer": "github:zardoy/mineflayer#gen-the-master", - "@nxg-org/mineflayer-physics-util": "1.8.10", + "@nxg-org/mineflayer-physics-util": "1.8.7", "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.98.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", @@ -214,10 +211,7 @@ "prismarine-item": "latest" }, "updateConfig": { - "ignoreDependencies": [ - "browserfs", - "google-drive-browserfs" - ] + "ignoreDependencies": [] }, "patchedDependencies": { "pixelarticons@1.8.1": "patches/pixelarticons@1.8.1.patch", @@ -234,9 +228,7 @@ "cypress", "esbuild", "fsevents" - ], - "ignorePatchFailures": false, - "allowUnusedPatches": false + ] }, "packageManager": "pnpm@10.8.0+sha512.0e82714d1b5b43c74610193cb20734897c1d00de89d0e18420aebc5977fa13d780a9cb05734624e81ebd81cc876cd464794850641c48b9544326b5622ca29971" } diff --git a/patches/minecraft-protocol.patch b/patches/minecraft-protocol.patch index e29f87d9..29111f69 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 0021870994fc59a82f0ac8aba0a65a8be43ef2f4..a53fceb843105ea2a1d88722b3fc7c3b43cb102a 100644 +index f14269bea055d4329cd729271e7406ec4b344de7..00f5482eb6e3c911381ca9a728b1b4aae0d1d337 100644 --- a/src/client/chat.js +++ b/src/client/chat.js -@@ -116,7 +116,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 - } -@@ -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' }), -+ // publicKey: crypto.createPublicKey({ key: player.crypto.publicKey, format: 'der', type: 'spki' }), - publicKeyDER: player.crypto.publicKey, - signature: player.crypto.signature, - displayName: player.displayName || player.name -@@ -196,7 +196,7 @@ module.exports = function (client, options) { +@@ -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 @@ -28,8 +28,8 @@ index 0021870994fc59a82f0ac8aba0a65a8be43ef2f4..a53fceb843105ea2a1d88722b3fc7c3b + 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', { - globalIndex: packet.globalIndex, -@@ -362,7 +362,7 @@ module.exports = function (client, options) { + plainMessage: packet.plainMessage, +@@ -363,7 +363,7 @@ module.exports = function (client, options) { } } @@ -38,16 +38,16 @@ index 0021870994fc59a82f0ac8aba0a65a8be43ef2f4..a53fceb843105ea2a1d88722b3fc7c3b options.timestamp = options.timestamp || BigInt(Date.now()) options.salt = options.salt || 1n -@@ -407,7 +407,7 @@ module.exports = function (client, options) { +@@ -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, - checksum: computeChatChecksum(client._lastSeenMessages), // 1.21.5+ acknowledged -@@ -422,7 +422,7 @@ module.exports = function (client, options) { + }) +@@ -419,7 +419,7 @@ module.exports = function (client, options) { message, timestamp: options.timestamp, salt: options.salt, @@ -57,7 +57,7 @@ index 0021870994fc59a82f0ac8aba0a65a8be43ef2f4..a53fceb843105ea2a1d88722b3fc7c3b previousMessages: client._lastSeenMessages.map((e) => ({ messageSender: e.sender, diff --git a/src/client/encrypt.js b/src/client/encrypt.js -index 63cc2bd9615100bd2fd63dfe14c094aa6b8cd1c9..36df57d1196af9761d920fa285ac48f85410eaef 100644 +index b9d21bab9faccd5dbf1975fc423fc55c73e906c5..99ffd76527b410e3a393181beb260108f4c63536 100644 --- a/src/client/encrypt.js +++ b/src/client/encrypt.js @@ -25,7 +25,11 @@ module.exports = function (client, options) { @@ -73,24 +73,28 @@ 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 +index 74749698f8cee05b5dc749c271544f78d06645b0..e77e0a3f41c1ee780c3abbd54b0801d248c2a07c 100644 --- a/src/client.js +++ b/src/client.js -@@ -111,7 +111,13 @@ 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 +- 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 { @@ -105,7 +109,7 @@ index e369e77d055ba919e8f9da7b8e8b5dc879c74cf4..54bb9e6644388e9b6bd42b3012951875 } }) } -@@ -169,7 +175,10 @@ class Client extends EventEmitter { +@@ -168,7 +176,10 @@ class Client extends EventEmitter { } const onFatalError = (err) => { @@ -117,21 +121,25 @@ index e369e77d055ba919e8f9da7b8e8b5dc879c74cf4..54bb9e6644388e9b6bd42b3012951875 endSocket() } -@@ -198,6 +207,10 @@ class Client extends EventEmitter { +@@ -197,6 +208,8 @@ class Client extends EventEmitter { serializer -> framer -> socket -> splitter -> deserializer */ if (this.serializer) { this.serializer.end() -+ setTimeout(() => { -+ this.socket?.end() -+ this.socket?.emit('end') -+ }, 2000) // allow the serializer to finish writing ++ this.socket?.end() ++ this.socket?.emit('end') } else { if (this.socket) this.socket.end() } -@@ -243,6 +256,7 @@ class Client extends EventEmitter { - debug('writing packet ' + this.state + '.' + name) - debug(params) - } +@@ -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/patches/pixelarticons@1.8.1.patch b/patches/pixelarticons@1.8.1.patch index b65b6f2b..10044536 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..4f8d76be2ca6e4ddc43c68d0a6f0f69979165ab4 100644 +index 3b2ebe839370d96bf93ef5ca94a827f07e49378d..103ab4d6b9f3b5c9f41d1407e3cbf4ac392fbf41 100644 --- a/fonts/pixelart-icons-font.css +++ b/fonts/pixelart-icons-font.css @@ -1,16 +1,13 @@ @@ -10,11 +10,10 @@ index 3b2ebe839370d96bf93ef5ca94a827f07e49378d..4f8d76be2ca6e4ddc43c68d0a6f0f699 + 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 5bcd74a0..faf6991a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,15 +5,14 @@ settings: excludeLinksFromLockfile: false overrides: - mineflayer: github:zardoy/mineflayer#gen-the-master - '@nxg-org/mineflayer-physics-util': 1.8.10 + '@nxg-org/mineflayer-physics-util': 1.8.7 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.98.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 @@ -23,13 +22,13 @@ overrides: patchedDependencies: minecraft-protocol: - hash: 4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b + hash: 3a55a278c417cc34ff3172cd1de8e22852935cba0586875cbd0635f1ffdaa5ab path: patches/minecraft-protocol.patch mineflayer-item-map-downloader@1.2.0: hash: a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad path: patches/mineflayer-item-map-downloader@1.2.0.patch pixelarticons@1.8.1: - hash: 533230072bc402f425c86abd3d0356fe087b14cab2a254d93f419b083f2d8dfa + hash: d6a3d784047beba873565d1198bed425d9eb2de942e3fc8edac55f25473e4325 path: patches/pixelarticons@1.8.1.patch importers: @@ -42,15 +41,12 @@ 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 + specifier: ^0.7.12 + version: 0.7.12 '@nxg-org/mineflayer-tracker': - specifier: 1.3.0 - version: 1.3.0(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) @@ -121,11 +117,8 @@ importers: specifier: ^10.0.12 version: 10.1.6 flying-squid: - 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) + 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 @@ -139,14 +132,14 @@ importers: specifier: ^4.17.21 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/dd3b1ff38506d6f72d90e8444186e4e75fe82659(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.98.0 - version: 3.98.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/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(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=a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad)(encoding@0.1.13) @@ -155,7 +148,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/e754999ffdea67853bc9b10553b5e9908b40f618 + version: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/92707300cce08287ed7750f4447be350fc342d07 node-gzip: specifier: ^1.1.2 version: 1.1.2 @@ -164,13 +157,13 @@ importers: version: 1.5.4 pixelarticons: specifier: ^1.8.1 - version: 1.8.1(patch_hash=533230072bc402f425c86abd3d0356fe087b14cab2a254d93f419b083f2d8dfa) + version: 1.8.1(patch_hash=d6a3d784047beba873565d1198bed425d9eb2de942e3fc8edac55f25473e4325) pretty-bytes: specifier: ^6.1.1 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.98.0) + 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.3 @@ -198,6 +191,9 @@ 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) @@ -280,6 +276,9 @@ 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 @@ -308,8 +307,8 @@ importers: specifier: ^1.0.0 version: 1.0.0 contro-max: - specifier: ^0.1.9 - version: 0.1.9(typescript@5.5.4) + specifier: ^0.1.8 + version: 0.1.8(typescript@5.5.4) crypto-browserify: specifier: ^3.12.0 version: 3.12.1 @@ -338,17 +337,20 @@ importers: specifier: ^1.0.0 version: 1.0.0 mc-assets: - specifier: ^0.2.62 - version: 0.2.62 + 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/89c33d396f3fde4804c71f4be3c203ade1833b41(@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:zardoy/mineflayer#gen-the-master - version: https://codeload.github.com/zardoy/mineflayer/tar.gz/dd3b1ff38506d6f72d90e8444186e4e75fe82659(encoding@0.1.13) + specifier: github:GenerelSchwerz/mineflayer + version: https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/d459d2ed76a997af1a7c94718ed7d5dee4478b8a(encoding@0.1.13) mineflayer-mouse: - specifier: ^0.1.21 - version: 0.1.21 + 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) + mineflayer-pathfinder: + specifier: ^2.4.4 + version: 2.4.5 npm-run-all: specifier: ^4.1.5 version: 4.1.5 @@ -436,7 +438,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.98.0) + 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 @@ -1992,16 +1994,6 @@ 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'} @@ -2030,14 +2022,14 @@ 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.18': - resolution: {integrity: sha512-O/nRCyWrRwFpcCXXSJhmt844c4a8KhkK4OJPAOKSc63tExIIQU/sipHgjgpy0B+gVDjSmLMPYXe71CN0W327Wg==} + '@nxg-org/mineflayer-auto-jump@0.7.12': + resolution: {integrity: sha512-F5vX/lerlWx/5HVlkDNbvrtQ19PL6iG8i4ItPTIRtjGiFzusDefP7DI226zSFR8Wlaw45qHv0jn814p/4/qVdQ==} - '@nxg-org/mineflayer-physics-util@1.8.10': - resolution: {integrity: sha512-JGIJEPauVmqoBFQ0I8ZtbaYo3mKn2N00srnDrWkCEt1qozyZWie4sYR0khjjwYubFCljMoWtoEA0+DLsHZLNFg==} + '@nxg-org/mineflayer-physics-util@1.8.7': + resolution: {integrity: sha512-wtLYvHqoEFr/j0ny2lyogwjbMvwpFuG2aWI8sI14+EAiGFRpL5+cog2ujSDsnRTZruO7tUXMTiPc1kebjXwfJg==} - '@nxg-org/mineflayer-tracker@1.3.0': - resolution: {integrity: sha512-HINrv51l2aZ/lDrcL77gSWDvf3Z3trd6kdiifXitCMDNdBT0FpWnXq9bi5Fr7yPpFGQ3fqGUIq5DQYYY84E9IA==} + '@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==} @@ -3319,18 +3311,47 @@ 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==} @@ -3387,13 +3408,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.104': - resolution: {integrity: sha512-jGhQ7fn7o8UN+mUwZbt9674D37YLuBi+Au4TwKcopCA6huIQdHTFNl2e+0ZSTI5mnhN+NpyVoR3vmtH6L58vHQ==} + '@zardoy/flying-squid@0.0.49': + resolution: {integrity: sha512-Kt4wr5/R+44tcLU9gjuNG2an9weWeKEpIoKXfsgJN2GGQqdnbd5nBpxfGDdgZ9aMdFugsVW8BsyPZNhj9vbMXA==} engines: {node: '>=8'} hasBin: true - '@zardoy/flying-squid@0.0.49': - resolution: {integrity: sha512-Kt4wr5/R+44tcLU9gjuNG2an9weWeKEpIoKXfsgJN2GGQqdnbd5nBpxfGDdgZ9aMdFugsVW8BsyPZNhj9vbMXA==} + '@zardoy/flying-squid@0.0.59': + resolution: {integrity: sha512-Ztrmv127csGovqJEWEtT19y1wGEB5tIVfneQ3+p/TirP/bTGYpLlW+Ns4sSAc4KrewUP9PW/6L0AtB69CWhQFQ==} engines: {node: '>=8'} hasBin: true @@ -3596,10 +3617,6 @@ 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'} @@ -3654,6 +3671,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'} @@ -3990,6 +4011,10 @@ 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'} @@ -4017,6 +4042,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'} @@ -4211,8 +4240,8 @@ packages: resolution: {integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==} engines: {node: '>= 0.6'} - contro-max@0.1.9: - resolution: {integrity: sha512-zH9FB60EzhHKublD92d11QuarYRTdYci5rvDgwDr5XXwUqae5mr6IgzXGcr78T2odnO/Aeqmrf32RDwJIl5GfQ==} + contro-max@0.1.8: + resolution: {integrity: sha512-5SoeudO8Zzfj/gbFTDrMRFJny02+MY1lBtb2NyCNiBLtHAfvhWZxZs/Z3yJvKL2rY/qKUZs9gTQOIDygBcBrdw==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} convert-source-map@1.9.0: @@ -4402,15 +4431,6 @@ 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'} @@ -4442,6 +4462,10 @@ 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'} @@ -4743,10 +4767,6 @@ 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'} @@ -4762,6 +4782,9 @@ 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'} @@ -5008,6 +5031,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'} @@ -5063,6 +5089,10 @@ 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==} @@ -5263,20 +5293,6 @@ 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'} @@ -5913,10 +5929,6 @@ 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'} @@ -6359,6 +6371,9 @@ 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==} @@ -6440,19 +6455,13 @@ packages: resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==} engines: {node: '>= 0.4'} - mc-assets@0.2.62: - resolution: {integrity: sha512-RYZeD1+joNlPuUpi+tIWkbP0ieVJr+R6IFkI6/8juhSxx9zE4osoSmteybrfspGm8A6u+YbbY1epqRKEMwVR6Q==} + mc-assets@0.2.53: + resolution: {integrity: sha512-Ucsu2pDLr/cs8bxbxU9KTszdf/vPTLphYgEHUEWxuYlMkPQUCpsQwkn3YgyykJ7RXaca7zZGlZXaTPXBAqJT6A==} 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.98.0 - - mcraft-fun-mineflayer@0.1.23: - resolution: {integrity: sha512-qmI1rQQ0Ro5zJdi99rClWLF+mS9JZffgNX2vyWWesS3Hsk3Xblp/8swYTJKHSaFpNgzkVfXV92fEIrBqeH6iKA==} - version: 0.1.23 + 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': '*' @@ -6658,19 +6667,19 @@ packages: resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==} engines: {node: '>=4'} - minecraft-data@3.98.0: - resolution: {integrity: sha512-JAPqJ/TZoxMUlAPPdWUh1v5wdqvYGFSZ4rW9bUtmaKBkGpomDSjw4V02ocBqbxKJvcTtmc5nM/LfN9/0DDqHrQ==} + minecraft-data@3.83.1: + resolution: {integrity: sha512-5K26za9k5WV1OnfkGexA77lBhfGZeFw3rT3NM7/rbFXRZC65prCx7Tk2BQvC9UfzgxxvmxHfxM5y8G1U+Oxgfg==} minecraft-folder-path@1.2.0: resolution: {integrity: sha512-qaUSbKWoOsH9brn0JQuBhxNAzTDMwrOXorwuRxdJKKKDYvZhtml+6GVCUrY5HRiEsieBEjCUnhVpDuQiKsiFaw==} - 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} + 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/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9: - resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9} - version: 1.62.0 + 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.6.0: @@ -6684,13 +6693,20 @@ packages: resolution: {tarball: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824} version: 1.2.0 - mineflayer-mouse@0.1.21: - resolution: {integrity: sha512-1XTVuw3twIrEcqQ1QRSB8NcStIUEZ+tbxiAG6rOrN/9M4thhtlS5PTJzFdmdrcYgWEBLvuOdJszaKE5zFfiXhg==} + 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@https://codeload.github.com/zardoy/mineflayer/tar.gz/dd3b1ff38506d6f72d90e8444186e4e75fe82659: - resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/dd3b1ff38506d6f72d90e8444186e4e75fe82659} - version: 8.0.0 + mineflayer-pathfinder@2.4.5: + resolution: {integrity: sha512-Jh3JnUgRLwhMh2Dugo4SPza68C41y+NPP5sdsgxRu35ydndo70i1JJGxauVWbXrpNwIxYNztUw78aFyb7icw8g==} + + mineflayer@4.27.0: + 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} + version: 4.27.0 engines: {node: '>=22'} minimalistic-assert@1.0.1: @@ -6788,9 +6804,6 @@ 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==} @@ -6798,12 +6811,6 @@ 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==} @@ -6855,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/e754999ffdea67853bc9b10553b5e9908b40f618: - resolution: {tarball: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/e754999ffdea67853bc9b10553b5e9908b40f618} + 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: @@ -7226,6 +7233,10 @@ 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==} @@ -7387,7 +7398,7 @@ packages: prismarine-biome@1.3.0: resolution: {integrity: sha512-GY6nZxq93mTErT7jD7jt8YS1aPrOakbJHh39seYsJFXvueIOdHAmW16kYQVrTVMW5MlWLQVxV/EquRwOgr4MnQ==} peerDependencies: - minecraft-data: 3.98.0 + minecraft-data: 3.83.1 prismarine-registry: ^1.1.0 prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9: @@ -7397,16 +7408,16 @@ packages: prismarine-chat@1.11.0: resolution: {integrity: sha512-VJT/MWYB3qoiznUhrgvSQh76YFpzpCZpY85kJKxHLbd3UVoM0wsfs43Eg8dOltiZG92wc5/DTMLlT07TEeoa9w==} - prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f: - resolution: {tarball: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f} + 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==} - prismarine-item@1.17.0: - resolution: {integrity: sha512-wN1OjP+f+Uvtjo3KzeCkVSy96CqZ8yG7cvuvlGwcYupQ6ct7LtNkubHp0AHuLMJ0vbbfAC0oZ2bWOgI1DYp8WA==} + prismarine-item@1.16.0: + resolution: {integrity: sha512-88Tz+/6HquYIsDuseae5G3IbqLeMews2L+ba2gX+p6K6soU9nuFhCfbwN56QuB7d/jZFcWrCYAPE5+UhwWh67w==} prismarine-nbt@2.7.0: resolution: {integrity: sha512-Du9OLQAcCj3y29YtewOJbbV4ARaSUEJiTguw0PPQbPBy83f+eCyDRkyBpnXTi/KPyEpgYCzsjGzElevLpFoYGQ==} @@ -8337,7 +8348,6 @@ 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==} @@ -8395,9 +8405,6 @@ 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'} @@ -8416,17 +8423,9 @@ 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==} @@ -8671,10 +8670,22 @@ 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==} @@ -9161,6 +9172,11 @@ 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} @@ -9260,6 +9276,34 @@ 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==} @@ -9334,10 +9378,6 @@ 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 @@ -9685,7 +9725,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: @@ -10310,7 +10350,7 @@ snapshots: '@babel/parser': 7.26.9 '@babel/template': 7.26.9 '@babel/types': 7.26.9 - debug: 4.4.1 + debug: 4.4.0(supports-color@8.1.1) globals: 11.12.0 transitivePeerDependencies: - supports-color @@ -11279,17 +11319,6 @@ 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': @@ -11322,18 +11351,17 @@ snapshots: rimraf: 3.0.2 optional: true - '@nxg-org/mineflayer-auto-jump@0.7.18': + '@nxg-org/mineflayer-auto-jump@0.7.12': dependencies: - '@nxg-org/mineflayer-physics-util': 1.8.10 + '@nxg-org/mineflayer-physics-util': 1.8.7 strict-event-emitter-types: 2.0.0 - '@nxg-org/mineflayer-physics-util@1.8.10': + '@nxg-org/mineflayer-physics-util@1.8.7': dependencies: '@nxg-org/mineflayer-util-plugin': 1.8.4 - '@nxg-org/mineflayer-tracker@1.3.0(encoding@0.1.13)': + '@nxg-org/mineflayer-tracker@1.2.1(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: @@ -11343,10 +11371,10 @@ snapshots: '@nxg-org/mineflayer-trajectories@1.2.0(encoding@0.1.13)': dependencies: '@nxg-org/mineflayer-util-plugin': 1.8.4 - minecraft-data: 3.98.0 - mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/dd3b1ff38506d6f72d90e8444186e4e75fe82659(encoding@0.1.13) + 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-item: 1.17.0 + prismarine-item: 1.16.0 prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b vec3: 0.1.10 transitivePeerDependencies: @@ -12891,7 +12919,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.1 + debug: 4.4.0(supports-color@8.1.1) eslint: 8.57.1 ts-api-utils: 1.4.3(typescript@5.5.4) optionalDependencies: @@ -12909,7 +12937,7 @@ snapshots: dependencies: '@typescript-eslint/types': 6.1.0 '@typescript-eslint/visitor-keys': 6.1.0 - debug: 4.4.1 + debug: 4.4.0(supports-color@8.1.1) globby: 11.1.0 is-glob: 4.0.3 semver: 7.7.1 @@ -12923,7 +12951,7 @@ snapshots: dependencies: '@typescript-eslint/types': 6.21.0 '@typescript-eslint/visitor-keys': 6.21.0 - debug: 4.4.1 + debug: 4.4.0(supports-color@8.1.1) globby: 11.1.0 is-glob: 4.0.3 minimatch: 9.0.3 @@ -12938,7 +12966,7 @@ snapshots: dependencies: '@typescript-eslint/types': 8.26.0 '@typescript-eslint/visitor-keys': 8.26.0 - debug: 4.4.1 + debug: 4.4.0(supports-color@8.1.1) fast-glob: 3.3.3 is-glob: 4.0.3 minimatch: 9.0.5 @@ -13007,28 +13035,68 @@ 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)': @@ -13094,7 +13162,7 @@ snapshots: '@types/emscripten': 1.40.0 tslib: 1.14.1 - '@zardoy/flying-squid@0.0.104(encoding@0.1.13)': + '@zardoy/flying-squid@0.0.49(encoding@0.1.13)': dependencies: '@tootallnate/once': 2.0.0 chalk: 5.4.1 @@ -13104,18 +13172,16 @@ snapshots: exit-hook: 2.2.1 flatmap: 0.0.3 long: 5.3.1 - 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) + 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) 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.98.0) + prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1) prismarine-entity: 2.5.0 - prismarine-item: 1.17.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.98.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.4.2 @@ -13132,7 +13198,7 @@ snapshots: - encoding - supports-color - '@zardoy/flying-squid@0.0.49(encoding@0.1.13)': + '@zardoy/flying-squid@0.0.59(encoding@0.1.13)': dependencies: '@tootallnate/once': 2.0.0 chalk: 5.4.1 @@ -13142,16 +13208,16 @@ snapshots: exit-hook: 2.2.1 flatmap: 0.0.3 long: 5.3.1 - 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) + 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) 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.98.0) + prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1) prismarine-entity: 2.5.0 - prismarine-item: 1.17.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.98.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.4.2 @@ -13229,7 +13295,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 @@ -13359,17 +13425,6 @@ 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: {} @@ -13378,7 +13433,7 @@ snapshots: dependencies: call-bind: 1.0.8 define-properties: 1.2.1 - es-abstract: 1.24.0 + es-abstract: 1.23.9 es-errors: 1.3.0 es-object-atoms: 1.1.1 es-shim-unscopables: 1.1.0 @@ -13401,7 +13456,7 @@ snapshots: dependencies: call-bind: 1.0.8 define-properties: 1.2.1 - es-abstract: 1.24.0 + es-abstract: 1.23.9 es-errors: 1.3.0 es-shim-unscopables: 1.1.0 @@ -13445,6 +13500,8 @@ snapshots: assertion-error@1.1.0: {} + assertion-error@2.0.1: {} + assign-symbols@1.0.0: {} ast-types@0.16.1: @@ -13876,6 +13933,14 @@ 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 @@ -13914,6 +13979,8 @@ snapshots: dependencies: get-func-name: 2.0.2 + check-error@2.1.1: {} + check-more-types@2.24.0: optional: true @@ -14131,7 +14198,7 @@ snapshots: content-type@1.0.5: {} - contro-max@0.1.9(typescript@5.5.4): + contro-max@0.1.8(typescript@5.5.4): dependencies: events: 3.3.0 lodash-es: 4.17.21 @@ -14396,10 +14463,6 @@ 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 @@ -14428,6 +14491,8 @@ snapshots: dependencies: type-detect: 4.1.0 + deep-eql@5.0.2: {} + deep-extend@0.6.0: {} deep-is@0.1.4: {} @@ -14532,7 +14597,7 @@ snapshots: detect-port@1.6.1: dependencies: address: 1.2.2 - debug: 4.4.1 + debug: 4.4.0(supports-color@8.1.1) transitivePeerDependencies: - supports-color @@ -14542,8 +14607,8 @@ snapshots: diamond-square@https://codeload.github.com/zardoy/diamond-square/tar.gz/cfaad2d1d5909fdfa63c8cc7bc05fb5e87782d71: dependencies: - minecraft-data: 3.98.0 - prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.98.0) + 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.11.0 random-seed: 0.3.0 vec3: 0.1.10 @@ -14843,63 +14908,6 @@ 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: {} @@ -14909,7 +14917,7 @@ snapshots: call-bind: 1.0.8 call-bound: 1.0.4 define-properties: 1.2.1 - es-abstract: 1.24.0 + es-abstract: 1.23.9 es-errors: 1.3.0 es-set-tostringtag: 2.1.0 function-bind: 1.1.2 @@ -14925,6 +14933,8 @@ 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 @@ -15178,7 +15188,7 @@ snapshots: eslint-plugin-react@7.37.4(eslint@8.57.1): dependencies: - array-includes: 3.1.9 + array-includes: 3.1.8 array.prototype.findlast: 1.2.5 array.prototype.flatmap: 1.3.3 array.prototype.tosorted: 1.1.4 @@ -15307,6 +15317,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: {} @@ -15384,6 +15398,8 @@ snapshots: expand-template@2.0.3: {} + expect-type@1.2.0: {} + exponential-backoff@3.1.2: optional: true @@ -15656,15 +15672,6 @@ 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: {} @@ -16095,7 +16102,7 @@ snapshots: dependencies: '@tootallnate/once': 2.0.0 agent-base: 6.0.2 - debug: 4.4.1 + debug: 4.4.0(supports-color@8.1.1) transitivePeerDependencies: - supports-color optional: true @@ -16139,14 +16146,14 @@ snapshots: https-proxy-agent@4.0.0: dependencies: agent-base: 5.1.1 - debug: 4.4.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.4.1 + debug: 4.4.0(supports-color@8.1.1) transitivePeerDependencies: - supports-color optional: true @@ -16381,8 +16388,6 @@ 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 @@ -16693,7 +16698,7 @@ snapshots: jsx-ast-utils@3.3.5: dependencies: - array-includes: 3.1.9 + array-includes: 3.1.8 array.prototype.flat: 1.3.3 object.assign: 4.1.7 object.values: 1.2.1 @@ -16885,6 +16890,8 @@ snapshots: dependencies: get-func-name: 2.0.2 + loupe@3.1.3: {} + lower-case@2.0.2: dependencies: tslib: 2.8.1 @@ -16981,22 +16988,18 @@ snapshots: math-intrinsics@1.1.0: {} - mc-assets@0.2.62: + mc-assets@0.2.53: dependencies: maxrects-packer: '@zardoy/maxrects-packer@2.7.4' zod: 3.24.2 - mc-bridge@0.1.3(minecraft-data@3.98.0): - dependencies: - 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)): + 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 - 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/dd3b1ff38506d6f72d90e8444186e4e75fe82659(encoding@0.1.13) - prismarine-item: 1.17.0 + 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: - bufferutil @@ -17225,7 +17228,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 @@ -17302,18 +17305,18 @@ snapshots: min-indent@1.0.1: {} - minecraft-data@3.98.0: {} + minecraft-data@3.83.1: {} minecraft-folder-path@1.2.0: {} - minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41(@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: - '@types/react' - react - minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(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 @@ -17322,7 +17325,7 @@ snapshots: debug: 4.4.0(supports-color@8.1.1) endian-toggle: 0.0.0 lodash.merge: 4.6.2 - minecraft-data: 3.98.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 @@ -17365,32 +17368,84 @@ 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/dd3b1ff38506d6f72d90e8444186e4e75fe82659(encoding@0.1.13) + mineflayer: 4.27.0(encoding@0.1.13) sharp: 0.30.7 transitivePeerDependencies: - encoding - supports-color - mineflayer-mouse@0.1.21: + 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.1 - prismarine-item: 1.17.0 + 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.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@https://codeload.github.com/zardoy/mineflayer/tar.gz/dd3b1ff38506d6f72d90e8444186e4e75fe82659(encoding@0.1.13): + mineflayer-pathfinder@2.4.5: dependencies: - '@nxg-org/mineflayer-physics-util': 1.8.10 - 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.98.0)(prismarine-registry@1.11.0) + minecraft-data: 3.83.1 + 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 + + 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-chat: 1.11.0 - prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.98.0) + prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1) prismarine-entity: 2.5.0 - prismarine-item: 1.17.0 + prismarine-item: 1.16.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/GenerelSchwerz/mineflayer/tar.gz/d459d2ed76a997af1a7c94718ed7d5dee4478b8a(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-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 + prismarine-item: 1.16.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) @@ -17503,8 +17558,6 @@ snapshots: dependencies: nearley: 2.20.1 - monaco-editor@0.52.2: {} - moo@0.5.2: {} morgan@1.10.0: @@ -17517,12 +17570,6 @@ 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: {} @@ -17586,7 +17633,7 @@ snapshots: neo-async@2.6.2: {} - net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/e754999ffdea67853bc9b10553b5e9908b40f618: + net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/92707300cce08287ed7750f4447be350fc342d07: dependencies: body-parser: 1.20.3 express: 4.21.2 @@ -17789,7 +17836,7 @@ snapshots: dependencies: call-bind: 1.0.8 define-properties: 1.2.1 - es-abstract: 1.24.0 + es-abstract: 1.23.9 es-object-atoms: 1.1.1 object.pick@1.3.0: @@ -18015,6 +18062,8 @@ snapshots: pathval@1.1.1: {} + pathval@2.0.0: {} + pause-stream@0.0.11: dependencies: through: 2.3.8 @@ -18074,7 +18123,7 @@ snapshots: pirates@4.0.6: {} - pixelarticons@1.8.1(patch_hash=533230072bc402f425c86abd3d0356fe087b14cab2a254d93f419b083f2d8dfa): {} + pixelarticons@1.8.1(patch_hash=d6a3d784047beba873565d1198bed425d9eb2de942e3fc8edac55f25473e4325): {} pixelmatch@4.0.2: dependencies: @@ -18174,17 +18223,17 @@ snapshots: transitivePeerDependencies: - supports-color - prismarine-biome@1.3.0(minecraft-data@3.98.0)(prismarine-registry@1.11.0): + prismarine-biome@1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0): dependencies: - minecraft-data: 3.98.0 + minecraft-data: 3.83.1 prismarine-registry: 1.11.0 prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9: dependencies: - minecraft-data: 3.98.0 - prismarine-biome: 1.3.0(minecraft-data@3.98.0)(prismarine-registry@1.11.0) + minecraft-data: 3.83.1 + prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0) prismarine-chat: 1.11.0 - prismarine-item: 1.17.0 + prismarine-item: 1.16.0 prismarine-nbt: 2.7.0 prismarine-registry: 1.11.0 @@ -18194,9 +18243,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.98.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.98.0)(prismarine-registry@1.11.0) + 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 @@ -18210,11 +18259,11 @@ snapshots: prismarine-entity@2.5.0: dependencies: prismarine-chat: 1.11.0 - prismarine-item: 1.17.0 + prismarine-item: 1.16.0 prismarine-registry: 1.11.0 vec3: 0.1.10 - prismarine-item@1.17.0: + prismarine-item@1.16.0: dependencies: prismarine-nbt: 2.7.0 prismarine-registry: 1.11.0 @@ -18225,14 +18274,14 @@ snapshots: prismarine-physics@https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b: dependencies: - minecraft-data: 3.98.0 + minecraft-data: 3.83.1 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.98.0): + 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/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.98.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 uint4: 0.1.2 @@ -18254,13 +18303,13 @@ snapshots: prismarine-registry@1.11.0: dependencies: - minecraft-data: 3.98.0 + minecraft-data: 3.83.1 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.98.0 + minecraft-data: 3.83.1 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 @@ -18268,7 +18317,7 @@ snapshots: prismarine-windows@2.9.0: dependencies: - prismarine-item: 1.17.0 + prismarine-item: 1.16.0 prismarine-registry: 1.11.0 typed-emitter: 2.1.0 @@ -18459,7 +18508,7 @@ snapshots: puppeteer-core@2.1.1: dependencies: '@types/mime-types': 2.1.4 - debug: 4.4.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 @@ -19099,7 +19148,7 @@ snapshots: send@1.2.0: dependencies: - debug: 4.4.1 + debug: 4.4.0(supports-color@8.1.1) encodeurl: 2.0.0 escape-html: 1.0.3 etag: 1.8.1 @@ -19109,7 +19158,7 @@ snapshots: ms: 2.1.3 on-finished: 2.4.1 range-parser: 1.2.1 - statuses: 2.0.2 + statuses: 2.0.1 transitivePeerDependencies: - supports-color @@ -19454,7 +19503,7 @@ snapshots: socks-proxy-agent@7.0.0: dependencies: agent-base: 6.0.2 - debug: 4.4.1 + debug: 4.4.0(supports-color@8.1.1) socks: 2.8.4 transitivePeerDependencies: - supports-color @@ -19561,8 +19610,6 @@ 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 @@ -19576,15 +19623,8 @@ 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): @@ -19654,7 +19694,7 @@ snapshots: string.prototype.repeat@1.0.0: dependencies: define-properties: 1.2.1 - es-abstract: 1.24.0 + es-abstract: 1.23.9 string.prototype.trim@1.2.10: dependencies: @@ -19877,8 +19917,14 @@ 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 @@ -20367,6 +20413,27 @@ 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.0(supports-color@8.1.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 @@ -20425,6 +20492,45 @@ 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.0(supports-color@8.1.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: {} @@ -20532,16 +20638,6 @@ 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 diff --git a/renderer/buildMesherWorker.mjs b/renderer/buildMesherWorker.mjs index d88297a5..47ea5771 100644 --- a/renderer/buildMesherWorker.mjs +++ b/renderer/buildMesherWorker.mjs @@ -35,10 +35,6 @@ const buildOptions = { define: { 'process.env.BROWSER': '"true"', }, - loader: { - '.png': 'dataurl', - '.obj': 'text' - }, plugins: [ ...mesherSharedPlugins, { diff --git a/renderer/playground/allEntitiesDebug.ts b/renderer/playground/allEntitiesDebug.ts deleted file mode 100644 index 5bc56ca6..00000000 --- a/renderer/playground/allEntitiesDebug.ts +++ /dev/null @@ -1,170 +0,0 @@ -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) -} diff --git a/renderer/playground/scenes/allEntities.ts b/renderer/playground/scenes/allEntities.ts index 281af807..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/three/entity/EntityMesh' -import { displayEntitiesDebugList } from '../allEntitiesDebug' export default class AllEntities extends BasePlaygroundScene { continuousRender = false @@ -8,6 +8,159 @@ export default class AllEntities extends BasePlaygroundScene { async initData () { await super.initData() - displayEntitiesDebugList(this.version) + + // 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/shared.ts b/renderer/playground/shared.ts index 9d12fae9..ba58a57f 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 (arr: T[], delay: number, exec: (item: T, index: number) => Promise, chunkSize = 1) => { +export const delayedIterator = async (arr: T[], delay: number, exec: (item: T, index: number) => 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 (arr: T[], delay: number, exec: (item: setTimeout(resolve, delay) }) } - await exec(arr[i], i) + exec(arr[i], i) } } diff --git a/renderer/rsbuildSharedConfig.ts b/renderer/rsbuildSharedConfig.ts index 45da30b1..57091d99 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|prismarine-physics/, (resource) => { + appendPlugins(new rspack.NormalModuleReplacementPlugin(/data/, (resource) => { let absolute: string const request = resource.request.replaceAll('\\', '/') absolute = path.join(resource.context, request).replaceAll('\\', '/') - if (request.includes('minecraft-data/data/pc/1.') || request.includes('prismarine-physics')) { - console.log('Error: incompatible resource', request, 'from', resource.contextInfo.issuer) + if (request.includes('minecraft-data/data/pc/1.')) { + console.log('Error: incompatible resource', request, resource.contextInfo.issuer) process.exit(1) // throw new Error(`${resource.request} was requested by ${resource.contextInfo.issuer}`) } diff --git a/renderer/viewer/baseGraphicsBackend.ts b/renderer/viewer/baseGraphicsBackend.ts index 486c930f..79607695 100644 --- a/renderer/viewer/baseGraphicsBackend.ts +++ b/renderer/viewer/baseGraphicsBackend.ts @@ -1,27 +1,15 @@ -import { proxy } from 'valtio' -import { NonReactiveState, RendererReactiveState } from '../../src/appViewer' +import { RendererReactiveState } from '../../src/appViewer' -export const getDefaultRendererState = (): { - reactive: RendererReactiveState - nonReactive: NonReactiveState -} => { +export const getDefaultRendererState = (): RendererReactiveState => { return { - reactive: proxy({ - world: { - chunksLoaded: new Set(), - heightmaps: new Map(), - allChunksLoaded: true, - mesherWork: false, - intersectMedia: null - }, - renderer: '', - preventEscapeMenu: false - }), - nonReactive: { - world: { - chunksLoaded: new Set(), - chunksTotalNumber: 0, - } - } + world: { + chunksLoaded: [], + chunksTotalNumber: 0, + allChunksLoaded: true, + mesherWork: false, + intersectMedia: null + }, + renderer: '', + preventEscapeMenu: false } } diff --git a/renderer/viewer/lib/basePlayerState.ts b/renderer/viewer/lib/basePlayerState.ts index 9cf1350a..df8cbc61 100644 --- a/renderer/viewer/lib/basePlayerState.ts +++ b/renderer/viewer/lib/basePlayerState.ts @@ -1,87 +1,123 @@ +import { EventEmitter } from 'events' +import { Vec3 } from 'vec3' +import TypedEmitter from 'typed-emitter' import { ItemSelector } from 'mc-assets/dist/itemDefinitions' -import { GameMode, Team } from 'mineflayer' -import { proxy } from 'valtio' -import type { HandItemBlock } from '../three/holdingBlock' +import { proxy, ref } from 'valtio' +import { GameMode } from 'mineflayer' +import { HandItemBlock } from '../three/holdingBlock' export type MovementState = 'NOT_MOVING' | 'WALKING' | 'SPRINTING' | 'SNEAKING' export type ItemSpecificContextProperties = Partial> -export type CameraPerspective = 'first_person' | 'third_person_back' | 'third_person_front' + + +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[] -// 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, - perspective: 'first_person' as CameraPerspective, - onFire: false, +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 - cameraSpectatingEntity: undefined as number | undefined, + events: TypedEmitter - team: undefined as Team | undefined, -}) - -export const getPlayerStateUtils = (reactive: PlayerStateReactive) => ({ - isSpectator () { - return reactive.gameMode === 'spectator' - }, - 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' - } -}) - -export const getInitialPlayerStateRenderer = () => ({ - reactive: getInitialPlayerState() -}) - -export type PlayerStateReactive = ReturnType -export type PlayerStateUtils = ReturnType - -export type PlayerStateRenderer = PlayerStateReactive - -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, + 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 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 + + 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) } } diff --git a/renderer/viewer/lib/createPlayerObject.ts b/renderer/viewer/lib/createPlayerObject.ts deleted file mode 100644 index 836c8062..00000000 --- a/renderer/viewer/lib/createPlayerObject.ts +++ /dev/null @@ -1,55 +0,0 @@ -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/lib/guiRenderer.ts b/renderer/viewer/lib/guiRenderer.ts index 709941dc..2689126e 100644 --- a/renderer/viewer/lib/guiRenderer.ts +++ b/renderer/viewer/lib/guiRenderer.ts @@ -9,6 +9,11 @@ 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' @@ -117,18 +122,18 @@ const RENDER_SIZE = 64 const generateItemsGui = async (models: Record, isItems = false) => { const { currentResources } = appViewer.resourcesManager - const imgBitmap = isItems ? currentResources!.itemsAtlasImage : currentResources!.blocksAtlasImage + const img = await getLoadedImage(isItems ? currentResources!.itemsAtlasParser.latestImage : currentResources!.blocksAtlasParser.latestImage) const canvasTemp = document.createElement('canvas') - canvasTemp.width = imgBitmap.width - canvasTemp.height = imgBitmap.height + canvasTemp.width = img.width + canvasTemp.height = img.height canvasTemp.style.imageRendering = 'pixelated' const ctx = canvasTemp.getContext('2d')! ctx.imageSmoothingEnabled = false - ctx.drawImage(imgBitmap, 0, 0) + ctx.drawImage(img, 0, 0) - const atlasParser = isItems ? appViewer.resourcesManager.itemsAtlasParser : appViewer.resourcesManager.blocksAtlasParser + const atlasParser = isItems ? currentResources!.itemsAtlasParser : currentResources!.blocksAtlasParser const textureAtlas = new TextureAtlas( - ctx.getImageData(0, 0, imgBitmap.width, imgBitmap.height), + ctx.getImageData(0, 0, img.width, img.height), Object.fromEntries(Object.entries(atlasParser.atlas.latest.textures).map(([key, value]) => { return [key, [ value.u, @@ -238,9 +243,6 @@ const generateItemsGui = async (models: Record, isIt return images } -/** - * @mainThread - */ const generateAtlas = async (images: Record) => { const atlas = makeTextureAtlas({ input: Object.keys(images), @@ -258,9 +260,9 @@ const generateAtlas = async (images: Record) => { // a.download = 'blocks_atlas.png' // a.click() - appViewer.resourcesManager.currentResources!.guiAtlas = { + activeGuiAtlas.atlas = { json: atlas.json, - image: await createImageBitmap(atlas.canvas), + image: ref(await getLoadedImage(atlas.canvas.toDataURL())), } return atlas @@ -277,6 +279,6 @@ export const generateGuiAtlas = async () => { const itemImages = await generateItemsGui(itemsModelsResolved, true) console.timeEnd('generate items gui atlas') await generateAtlas({ ...blockImages, ...itemImages }) - appViewer.resourcesManager.currentResources!.guiAtlasVersion++ + activeGuiAtlas.version++ // await generateAtlas(blockImages) } diff --git a/renderer/viewer/three/hand.ts b/renderer/viewer/lib/hand.ts similarity index 93% rename from renderer/viewer/three/hand.ts rename to renderer/viewer/lib/hand.ts index 2bd3832b..3743aca9 100644 --- a/renderer/viewer/three/hand.ts +++ b/renderer/viewer/lib/hand.ts @@ -1,7 +1,6 @@ import * as THREE from 'three' -import { loadSkinFromUsername, loadSkinImage } from '../lib/utils/skins' -import { steveTexture } from './entities' - +import { loadSkinToCanvas } from 'skinview-utils' +import { getLookupUrl, loadSkinImage, steveTexture } from './utils/skins' export const getMyHand = async (image?: string, userName?: string) => { let newMap: THREE.Texture @@ -9,10 +8,7 @@ export const getMyHand = async (image?: string, userName?: string) => { newMap = await steveTexture } else { if (!image) { - image = await loadSkinFromUsername(userName!, 'skin') - } - if (!image) { - return + image = getLookupUrl(userName!, 'skin') } const { canvas } = await loadSkinImage(image) newMap = new THREE.CanvasTexture(canvas) diff --git a/renderer/viewer/lib/mesher/mesher.ts b/renderer/viewer/lib/mesher/mesher.ts index a063d77f..21e2d8ef 100644 --- a/renderer/viewer/lib/mesher/mesher.ts +++ b/renderer/viewer/lib/mesher/mesher.ts @@ -2,7 +2,6 @@ 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)) @@ -77,7 +76,6 @@ const handleMessage = data => { if (data.type === 'mcData') { globalVar.mcData = data.mcData - globalVar.loadedData = data.mcData } if (data.config) { @@ -139,7 +137,6 @@ const handleMessage = data => { dirtySections = new Map() // todo also remove cached globalVar.mcData = null - globalVar.loadedData = null allDataReady = false break @@ -151,30 +148,6 @@ 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 = world.config.worldMaxY - let block = world.getBlock(blockPos) - while (block && INVISIBLE_BLOCKS.has(block.name) && blockPos.y > world.config.worldMinY) { - 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 aca47e15..fc57d2b3 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, isWater: boolean, isRealWater: boolean) { - if ((isWater && !isRealWater) || (block && isBlockWaterlogged(block))) return 8 / 9 +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)) @@ -125,19 +125,12 @@ 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: MesherGeometryOutput, isRealWater: boolean) { +function renderLiquid (world: World, cursor: Vec3, texture: any | undefined, type: number, biome: string, water: boolean, attr: Record, 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, water, isRealWater)) + heights.push(getLiquidRenderHeight(world, world.getBlock(pos), type, pos, isRealWater)) } } const cornerHeights = [ @@ -149,7 +142,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, mask1, mask2 } = elemFaces[face] + const { dir, corners } = elemFaces[face] const isUp = dir[1] === 1 const neighborPos = cursor.offset(...dir as [number, number, number]) @@ -187,44 +180,16 @@ 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]] - 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_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 ) - 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) { - 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) + 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]) } } } @@ -336,7 +301,7 @@ function renderElement (world: World, cursor: Vec3, element: BlockElement, doAO: let localShift = null as any if (element.rotation && !needTiles) { - // Rescale support for block model rotations + // todo do we support rescale? localMatrix = buildRotationMatrix( element.rotation.axis, element.rotation.angle @@ -349,37 +314,6 @@ 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[] = [] @@ -519,7 +453,7 @@ const isBlockWaterlogged = (block: Block) => { } let unknownBlockModel: BlockModelPartsResolved -export function getSectionGeometry (sx: number, sy: number, sz: number, world: World) { +export function getSectionGeometry (sx, sy, sz, world: World) { let delayedRender = [] as Array<() => void> const attr: MesherGeometryOutput = { @@ -542,6 +476,7 @@ export function getSectionGeometry (sx: number, sy: number, sz: number, world: W heads: {}, signs: {}, // isFull: true, + highestBlocks: {}, hadErrors: false, blocksCount: 0 } @@ -551,6 +486,12 @@ 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[`${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 } + } + } 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 230db6b9..eb1346f4 100644 --- a/renderer/viewer/lib/mesher/shared.ts +++ b/renderer/viewer/lib/mesher/shared.ts @@ -3,13 +3,11 @@ import { BlockType } from '../../../playground/shared' // only here for easier testing export const defaultMesherConfig = { version: '', - worldMaxY: 256, - worldMinY: 0, enableLighting: true, 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 @@ -42,20 +40,12 @@ export type MesherGeometryOutput = { heads: Record, signs: Record, // isFull: boolean + highestBlocks: Record 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 }; - 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/mesher/test/tests.test.ts b/renderer/viewer/lib/mesher/test/tests.test.ts index 2c3dc6a5..7959f573 100644 --- a/renderer/viewer/lib/mesher/test/tests.test.ts +++ b/renderer/viewer/lib/mesher/test/tests.test.ts @@ -49,6 +49,9 @@ 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, } `) diff --git a/renderer/viewer/lib/renderUtils.js b/renderer/viewer/lib/renderUtils.js new file mode 100644 index 00000000..14176561 --- /dev/null +++ b/renderer/viewer/lib/renderUtils.js @@ -0,0 +1,11 @@ +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 f471aa9d..a1574b5c 100644 --- a/renderer/viewer/lib/utils.ts +++ b/renderer/viewer/lib/utils.ts @@ -1,3 +1,27 @@ +import * as THREE from 'three' + +let textureCache: Record = {} +let imagesPromises: Record> = {} + +export async function loadTexture (texture: string, cb: (texture: THREE.Texture) => void, onLoad?: () => void): Promise { + const cached = textureCache[texture] + if (!cached) { + const { promise, resolve } = Promise.withResolvers() + textureCache[texture] = new THREE.TextureLoader().load(texture, 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 { const existingScript = document.querySelector(`script[src="${scriptSrc}"]`) if (existingScript) { @@ -25,33 +49,3 @@ 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 { - 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 3163702c..385c16c1 100644 --- a/renderer/viewer/lib/utils/skins.ts +++ b/renderer/viewer/lib/utils/skins.ts @@ -1,59 +1,27 @@ import { loadSkinToCanvas } from 'skinview-utils' -import { createCanvas, loadImageFromUrl } from '../utils' +import * as THREE from 'three' +import stevePng from 'mc-assets/dist/other-textures/latest/entity/player/wide/steve.png' -export { default as stevePngUrl } 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) -const config = { - apiEnabled: true, +export async function loadImageFromUrl (imageUrl: string): Promise { + const img = new Image() + img.src = imageUrl + await new Promise(resolve => { + img.onload = () => resolve() + }) + return img } -export const setSkinsConfig = (newConfig: Partial) => { - Object.assign(config, newConfig) +export function getLookupUrl (username: string, type: 'skin' | 'cape'): string { + return `https://mulv.tycrek.dev/api/lookup?username=${username}&type=${type}` } -export async function loadSkinFromUsername (username: string, type: 'skin' | 'cape'): Promise { - 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: OffscreenCanvas, image: ImageBitmap }> { - if (!skinUrl.startsWith('data:')) { - skinUrl = await fetchAndConvertBase64Skin(skinUrl.replace('http://', 'https://')) - } - +export async function loadSkinImage (skinUrl: string): Promise<{ canvas: HTMLCanvasElement, image: HTMLImageElement }> { const image = await loadImageFromUrl(skinUrl) - const skinCanvas = createCanvas(64, 64) + 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/workerProxy.ts b/renderer/viewer/lib/workerProxy.ts index 2b38dca9..9d8e7fcc 100644 --- a/renderer/viewer/lib/workerProxy.ts +++ b/renderer/viewer/lib/workerProxy.ts @@ -1,20 +1,9 @@ -import { proxy, getVersion, subscribe } from 'valtio' - -export function createWorkerProxy void | Promise>> (handlers: T, channel?: MessagePort): { __workerProxy: T } { +export function createWorkerProxy void>> (handlers: T, channel?: MessagePort): { __workerProxy: T } { const target = channel ?? globalThis target.addEventListener('message', (event: any) => { - const { type, args, msgId } = event.data + const { type, args } = event.data if (handlers[type]) { - const result = handlers[type](...args) - if (result instanceof Promise) { - void result.then((result) => { - target.postMessage({ - type: 'result', - msgId, - args: [result] - }) - }) - } + handlers[type](...args) } }) return null as any @@ -34,7 +23,6 @@ export function createWorkerProxy v export const useWorkerProxy = 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) { @@ -53,30 +41,11 @@ export const useWorkerProxy = { - 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) - }) : [] + 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, - msgId, args, - }, 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) - } - } + }, transfer as any[]) } } }) diff --git a/renderer/viewer/lib/worldDataEmitter.ts b/renderer/viewer/lib/worldDataEmitter.ts index dfbdb35c..56c71d40 100644 --- a/renderer/viewer/lib/worldDataEmitter.ts +++ b/renderer/viewer/lib/worldDataEmitter.ts @@ -7,8 +7,9 @@ import { Vec3 } from 'vec3' import { BotEvents } from 'mineflayer' import { proxy } from 'valtio' import TypedEmitter from 'typed-emitter' -import { Biome } from 'minecraft-data' +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' @@ -19,34 +20,24 @@ 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 | { blockEntities: Record }) => 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 updateLight: (data: { pos: Vec3 }) => void onWorldSwitch: () => void end: () => void - biomeUpdate: (data: { biome: Biome }) => void - biomeReset: () => void -} - -export class WorldDataEmitterWorker extends (EventEmitter as new () => TypedEmitter) { - static readonly restorerName = 'WorldDataEmitterWorker' } +/** + * 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 as new () => TypedEmitter) { - spiralNumber = 0 - gotPanicLastTime = false - panicChunksReload = () => {} loadedChunks: Record - private inLoading = false - private chunkReceiveTimes: number[] = [] - private lastChunkReceiveTime = 0 - public lastChunkReceiveTimeAvg = 0 - private panicTimeout?: NodeJS.Timeout readonly lastPos: Vec3 private eventListeners: Record = {} private readonly emitter: WorldDataEmitter @@ -66,6 +57,11 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter TypedEmitter() - 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) return - if (e === bot.entity) { - if (name === 'entity') { - this.emitter.emit('playerEntity', e) - } - return - } + 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, username: e.username, - team: bot.teamMap[e.username] || bot.teamMap[e.uuid], // set debugTree (obj) { // e.debugTree = obj // } @@ -134,9 +115,6 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter TypedEmitter { - 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) @@ -168,19 +139,12 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter { 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) - 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 @@ -191,6 +155,22 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter { + 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) } @@ -204,16 +184,8 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter TypedEmitter new Vec3((botX + x) * 16, 0, (botZ + z) * 16)) this.lastPos.update(pos) - await this._loadChunks(positions, pos) + await this._loadChunks(positions) } - 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 + 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> let continueLoading = true - this.inLoading = true await delayedIterator(positions, this.addWaitTime, async (pos) => { - if (!continueLoading || this.loadedChunks[`${pos.x},${pos.z}`]) return + const promise = (async () => { + if (!continueLoading || this.loadedChunks[`${pos.x},${pos.z}`]) return - // Wait for chunk to be available from server - if (!this.world.getColumnAt(pos)) { - continueLoading = await new Promise(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() + if (!this.world.getColumnAt(pos)) { + continueLoading = await new Promise(resolve => { + this.waitingSpiralChunksLoad[`${pos.x},${pos.z}`] = resolve + }) + } + if (!continueLoading) return + await this.loadChunk(pos) + })() + promises.push(promise) }) - if (this.panicTimeout) clearTimeout(this.panicTimeout) - this.inLoading = false - this.gotPanicLastTime = false - this.chunkReceiveTimes = [] - this.lastChunkReceiveTime = 0 + await Promise.all(promises) } readdDebug () { @@ -363,37 +302,8 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter TypedEmitter TypedEmitter !!a) this.lastPos.update(pos) - void this._loadChunks(positions, pos) + void this._loadChunks(positions) } else { this.emitter.emit('chunkPosUpdate', { pos }) // todo-low this.lastPos.update(pos) diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts index 4140e3fa..bff991ef 100644 --- a/renderer/viewer/lib/worldrendererCommon.ts +++ b/renderer/viewer/lib/worldrendererCommon.ts @@ -1,76 +1,54 @@ /* 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 type { ResourcesManagerTransferred } from '../../../src/resourcesManager' +import { toMajorVersion } from '../../../src/utils' +import { ResourcesManager } from '../../../src/resourcesManager' import { DisplayWorldOptions, GraphicsInitOptions, RendererReactiveState } from '../../../src/appViewer' import { SoundSystem } from '../three/threeJsSound' import { buildCleanupDecorator } from './cleanupDecorator' -import { HighestBlockInfo, CustomBlockModels, BlockStateModelInfo, getBlockAssetsCacheKey, MesherConfig, MesherMainEvent } from './mesher/shared' +import { HighestBlockInfo, MesherGeometryOutput, CustomBlockModels, BlockStateModelInfo, getBlockAssetsCacheKey, MesherConfig } from './mesher/shared' import { chunkPos } from './simpleUtils' -import { addNewStat, removeAllStats, updatePanesVisibility, updateStatText } from './ui/newStats' -import { WorldDataEmitterWorker } from './worldDataEmitter' -import { getPlayerStateUtils, PlayerStateReactive, PlayerStateRenderer, PlayerStateUtils } from './basePlayerState' +import { addNewStat, removeAllStats, removeStat, updatePanesVisibility, updateStatText } from './ui/newStats' +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 } -const toMajorVersion = version => { - const [a, b] = (String(version)).split('.') - return `${a}.${b}` -} - export const worldCleanup = buildCleanupDecorator('resetWorld') export const defaultWorldRendererConfig = { - // Debug settings showChunkBorders: false, - enableDebugOverlay: false, - - // Performance settings mesherWorkers: 4, - addChunksBatchWaitTime: 200, - _experimentalSmoothChunkLoading: true, - _renderByChunks: false, - - // Rendering engine settings - dayCycle: true, + isPlayground: false, + renderEars: true, + // game renderer setting actually + showHand: false, + viewBobbing: false, + extraBlockRenderers: true, + clipWorldBelowY: undefined as number | undefined, smoothLighting: true, enableLighting: true, starfield: true, - defaultSkybox: true, - 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 + addChunksBatchWaitTime: 200, vrSupport: true, - vrPageGameRendering: true, - - // World settings - clipWorldBelowY: undefined as number | undefined, - isPlayground: false + renderEntities: true, + fov: 75, + fetchPlayerSkins: true, + highlightBlockColor: 'blue', + foreground: true, + _experimentalSmoothChunkLoading: true, + _renderByChunks: false } export type WorldRendererConfig = typeof defaultWorldRendererConfig @@ -80,17 +58,6 @@ export abstract class WorldRendererCommon 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 @@ -117,11 +84,10 @@ export abstract class WorldRendererCommon 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[] = [] - viewerChunkPosition?: Vec3 + viewerPosition?: Vec3 lastCamUpdate = 0 droppedFpsPercentage = 0 initialChunkLoadWasStartedIn: number | undefined @@ -136,7 +102,8 @@ export abstract class WorldRendererCommon ONMESSAGE_TIME_LIMIT = 30 // ms handleResize = () => { } - highestBlocksByChunks = new Map() + highestBlocksByChunks = {} as Record + highestBlocksBySections = {} as Record blockEntities = {} workersProcessAverageTime = 0 @@ -170,8 +137,7 @@ export abstract class WorldRendererCommon abstract changeBackgroundColor (color: [number, number, number]): void worldRendererConfig: WorldRendererConfig - playerStateReactive: PlayerStateReactive - playerStateUtils: PlayerStateUtils + playerState: IPlayerState reactiveState: RendererReactiveState mesherLogReader: MesherLogReader | undefined forceCallFromMesherReplayer = false @@ -187,7 +153,6 @@ export abstract class WorldRendererCommon } currentRenderedFrames = 0 fpsAverage = 0 - lastFps = 0 fpsWorst = undefined as number | undefined fpsSamples = 0 mainThreadRendering = true @@ -203,11 +168,11 @@ export abstract class WorldRendererCommon return (this.initOptions.config.statsVisible ?? 0) > 1 } - constructor (public readonly resourcesManager: ResourcesManagerTransferred, public displayOptions: DisplayWorldOptions, public initOptions: GraphicsInitOptions) { + 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.playerStateReactive = displayOptions.playerStateReactive - this.playerStateUtils = getPlayerStateUtils(this.playerStateReactive) + this.playerState = displayOptions.playerState this.reactiveState = displayOptions.rendererState // this.mesherLogReader = new MesherLogReader(this) this.renderUpdateEmitter.on('update', () => { @@ -219,7 +184,7 @@ export abstract class WorldRendererCommon this.connect(this.displayOptions.worldView) - const interval = setInterval(() => { + setInterval(() => { this.geometryReceiveCountPerSec = Object.values(this.geometryReceiveCount).reduce((acc, curr) => acc + curr, 0) this.geometryReceiveCount = {} updatePanesVisibility(this.displayAdvancedStats) @@ -228,9 +193,6 @@ export abstract class WorldRendererCommon this.fpsUpdate() } }, 500) - this.abortController.signal.addEventListener('abort', () => { - clearInterval(interval) - }) } fpsUpdate () { @@ -241,7 +203,6 @@ export abstract class WorldRendererCommon } else { this.fpsWorst = Math.min(this.fpsWorst, this.currentRenderedFrames) } - this.lastFps = this.currentRenderedFrames this.currentRenderedFrames = 0 } @@ -252,11 +213,15 @@ export abstract class WorldRendererCommon 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?.allReady) { + if (this.resourcesManager.currentResources) { await this.updateAssetsData() } })() @@ -268,7 +233,6 @@ export abstract class WorldRendererCommon }) this.watchReactivePlayerState() - this.watchReactiveConfig() this.worldReadyResolvers.resolve() } @@ -279,7 +243,7 @@ export abstract class WorldRendererCommon } async getHighestBlocks (chunkKey: string) { - return this.highestBlocksByChunks.get(chunkKey) + return this.highestBlocksByChunks[chunkKey] } updateCustomBlock (chunkKey: string, blockPos: string, model: string) { @@ -308,47 +272,44 @@ export abstract class WorldRendererCommon initWorkers (numWorkers = this.worldRendererConfig.mesherWorkers) { // init workers for (let i = 0; i < numWorkers + 1; i++) { - const worker = initMesherWorker((data) => { + // 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 }) => { 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) } } - onReactivePlayerStateUpdated(key: T, callback: (value: PlayerStateReactive[T]) => void, initial = true) { - if (initial) { - callback(this.playerStateReactive[key]) - } - subscribeKey(this.playerStateReactive, key, callback) - } - - onReactiveConfigUpdated(key: T, callback: (value: typeof this.worldRendererConfig[T]) => void) { - callback(this.worldRendererConfig[key]) - subscribeKey(this.worldRendererConfig, key, callback) - } - - onReactiveDebugUpdated(key: T, callback: (value: typeof this.reactiveDebugParams[T]) => void) { - callback(this.reactiveDebugParams[key]) - subscribeKey(this.reactiveDebugParams, key, callback) + onReactiveValueUpdated(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.onReactivePlayerStateUpdated('backgroundColor', (value) => { + 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`) @@ -389,19 +350,20 @@ export abstract class WorldRendererCommon this.isProcessingQueue = false } - handleMessage (rawData: any) { - const data = rawData as MesherMainEvent + 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 as WorkerReceive) + 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 })}`) 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]))) } @@ -427,7 +389,6 @@ export abstract class WorldRendererCommon 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 @@ -466,10 +427,6 @@ export abstract class WorldRendererCommon this.blockStateModelInfo.set(cacheKey, info) } } - - if (data.type === 'heightmap') { - this.reactiveState.world.heightmaps.set(data.key, new Uint8Array(data.heightmap)) - } } downloadMesherLog () { @@ -510,12 +467,8 @@ export abstract class WorldRendererCommon timeUpdated? (newTime: number): void - biomeUpdated? (biome: any): void - - biomeReset? (): void - updateViewerPosition (pos: Vec3) { - this.viewerChunkPosition = pos + this.viewerPosition = pos for (const [key, value] of Object.entries(this.loadedChunks)) { if (!value) continue this.updatePosDataChunk?.(key) @@ -529,7 +482,7 @@ export abstract class WorldRendererCommon } getDistance (posAbsolute: Vec3) { - const [botX, botZ] = chunkPos(this.viewerChunkPosition!) + const [botX, botZ] = chunkPos(this.viewerPosition!) 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] @@ -549,7 +502,7 @@ export abstract class WorldRendererCommon this.resetWorld() // for workers in single file build - if (typeof document !== 'undefined' && document?.readyState === 'loading') { + if (document?.readyState === 'loading') { await new Promise(resolve => { document.addEventListener('DOMContentLoaded', resolve) }) @@ -581,12 +534,10 @@ export abstract class WorldRendererCommon 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, - worldMinY: this.worldMinYRender, - worldMaxY: this.worldMinYRender + this.worldSizeParams.worldHeight, + disableSignsMapsSupport: !this.worldRendererConfig.extraBlockRenderers } } @@ -606,7 +557,7 @@ export abstract class WorldRendererCommon } 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()) { @@ -616,7 +567,7 @@ export abstract class WorldRendererCommon type: 'mesherData', workerIndex: i, blocksAtlas: { - latest: resources.blocksAtlasJson + latest: resources.blocksAtlasParser.atlas.latest }, blockstatesModels, config: this.getMesherConfig(), @@ -633,7 +584,7 @@ export abstract class WorldRendererCommon updateChunksStats () { const loadedChunks = Object.keys(this.finishedChunks) - this.displayOptions.nonReactiveState.world.chunksLoaded = new Set(loadedChunks) + this.displayOptions.nonReactiveState.world.chunksLoaded = loadedChunks this.displayOptions.nonReactiveState.world.chunksTotalNumber = this.chunksLength this.reactiveState.world.allChunksLoaded = this.allChunksFinished @@ -662,11 +613,6 @@ export abstract class WorldRendererCommon 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) { @@ -703,8 +649,9 @@ export abstract class WorldRendererCommon 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.highestBlocksByChunks.delete(`${x},${z}`) + delete this.highestBlocksByChunks[`${x},${z}`] this.updateChunksStats() @@ -736,11 +683,9 @@ export abstract class WorldRendererCommon updateEntity (e: any, isUpdate = false) { } - abstract updatePlayerEntity? (e: any): void - lightUpdate (chunkX: number, chunkZ: number) { } - connect (worldView: WorldDataEmitterWorker) { + connect (worldView: WorldDataEmitter) { const worldEmitter = worldView worldEmitter.on('entity', (e) => { @@ -749,9 +694,6 @@ export abstract class WorldRendererCommon worldEmitter.on('entityMoved', (e) => { this.updateEntity(e, true) }) - worldEmitter.on('playerEntity', (e) => { - this.updatePlayerEntity?.(e) - }) let currentLoadChunkBatch = null as { timeout @@ -822,22 +764,16 @@ export abstract class WorldRendererCommon }) worldEmitter.on('onWorldSwitch', () => { - for (const fn of this.onWorldSwitched) { - try { - fn() - } catch (e) { - setTimeout(() => { - console.log('[Renderer Backend] Error in onWorldSwitched:') - throw e - }, 0) - } - } + for (const fn of this.onWorldSwitched) fn() }) 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 @@ -847,13 +783,7 @@ export abstract class WorldRendererCommon // } }) - worldEmitter.on('biomeUpdate', ({ biome }) => { - this.biomeUpdated?.(biome) - }) - - worldEmitter.on('biomeReset', () => { - this.biomeReset?.() - }) + worldEmitter.emit('listening') } setBlockStateIdInner (pos: Vec3, stateId: number | undefined, needAoRecalculation = true) { @@ -1047,41 +977,8 @@ export abstract class WorldRendererCommon this.active = false this.renderUpdateEmitter.removeAllListeners() + this.displayOptions.worldView.removeAllListeners() // todo this.abortController.abort() 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) => { - 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/sign-renderer/index.ts b/renderer/viewer/sign-renderer/index.ts index f14b9b4c..a1e4331f 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,40 +32,29 @@ const parseSafe = (text: string, task: string) => { } } -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) } -) => { +export const renderSign = (blockEntity: SignBlockEntity, PrismarineChat: typeof ChatMessage, ctxHook = (ctx) => { }) => { // 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 - // todo the text should be clipped based on it's render width (needs investigate) + + 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 + } const texts = 'front_text' in blockEntity ? /* > 1.20 */ blockEntity.front_text.messages : [ blockEntity.Text1, @@ -73,144 +62,78 @@ export const renderSign = ( 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 - renderComponent(text, PrismarineChat, canvas, fontSize, defaultColor, fontSize * (lineNum + 1) + (isHanging ? 0 : -8)) + 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? + } } + // 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 a7438092..92ff5d03 100644 --- a/renderer/viewer/sign-renderer/playground.ts +++ b/renderer/viewer/sign-renderer/playground.ts @@ -21,14 +21,9 @@ const blockEntity = { await document.fonts.load('1em mojangles') -const canvas = renderSign(blockEntity, false, PrismarineChat, (ctx) => { +const canvas = renderSign(blockEntity, 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 ab268849..b8fc94fc 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, true, PrismarineChat) + renderSign(entity, PrismarineChat) return ctxTexts.map(({ text, y }) => [y / 64, text]) } @@ -37,6 +37,10 @@ test('sign renderer', () => { } as any expect(render(blockEntity)).toMatchInlineSnapshot(` [ + [ + 1, + "", + ], [ 1, "Minecraft ", diff --git a/renderer/viewer/three/appShared.ts b/renderer/viewer/three/appShared.ts index 5be9e10b..9afbe563 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, PlayerStateRenderer } from 'renderer/viewer/lib/basePlayerState' +import { ItemSpecificContextProperties } from 'renderer/viewer/lib/basePlayerState' +import { renderSlot } from '../../../src/inventoryWindows' import { GeneralInputItem, getItemModelName } from '../../../src/mineflayer/items' -import { ResourcesManager, ResourcesManagerTransferred } from '../../../src/resourcesManager' -import { renderSlot } from './renderSlot' +import { ResourcesManager } from '../../../src/resourcesManager' -export const getItemUv = (item: Record, specificProps: ItemSpecificContextProperties, resourcesManager: ResourcesManagerTransferred, playerState: PlayerStateRenderer): { +export const getItemUv = (item: Record, specificProps: ItemSpecificContextProperties, resourcesManager: ResourcesManager): { u: number v: number su: number sv: number renderInfo?: ReturnType - // texture: ImageBitmap + texture: HTMLImageElement modelName: string } | { resolvedModel: BlockModel @@ -19,22 +19,18 @@ export const getItemUv = (item: Record, 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 = - blockState - ? loadedData.blocksByStateId[blockState]?.name - : typeof idOrName === 'number' ? loadedData.items[idOrName]?.name : idOrName + 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, resourcesManager, playerState) + } as GeneralInputItem, specificProps, resourcesManager) const renderInfo = renderSlot({ modelName: model, - }, resourcesManager, false, true) + }, false, true) if (!renderInfo) throw new Error(`Failed to get render info for item ${name}`) @@ -53,7 +49,7 @@ export const getItemUv = (item: Record, specificProps: ItemSpecific return { u, v, su, sv, renderInfo, - // texture: img, + texture: img, modelName: renderInfo.modelName! } } @@ -67,7 +63,7 @@ export const getItemUv = (item: Record, 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/cameraShake.ts b/renderer/viewer/three/cameraShake.ts index 7b159509..f6a61e2e 100644 --- a/renderer/viewer/three/cameraShake.ts +++ b/renderer/viewer/three/cameraShake.ts @@ -1,5 +1,4 @@ import * as THREE from 'three' -import { WorldRendererThree } from './worldrendererThree' export class CameraShake { private rollAngle = 0 @@ -9,7 +8,7 @@ export class CameraShake { private basePitch = 0 private baseYaw = 0 - constructor (public worldRenderer: WorldRendererThree, public onRenderCallbacks: Array<() => void>) { + constructor (public camera: THREE.Camera, public onRenderCallbacks: Array<() => void>) { onRenderCallbacks.push(() => { this.update() }) @@ -21,10 +20,6 @@ export class CameraShake { this.update() } - getBaseRotation () { - return { pitch: this.basePitch, yaw: this.baseYaw } - } - shakeFromDamage (yaw?: number) { // Add roll animation const startRoll = this.rollAngle @@ -39,11 +34,6 @@ 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() @@ -72,25 +62,14 @@ export class CameraShake { } } - const camera = this.worldRenderer.cameraObject + // 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)) - 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 - // 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) - camera.setRotationFromQuaternion(finalQuat) - } + // 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 { @@ -100,21 +79,4 @@ 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/documentRenderer.ts b/renderer/viewer/three/documentRenderer.ts index a5dc060d..46672b74 100644 --- a/renderer/viewer/three/documentRenderer.ts +++ b/renderer/viewer/three/documentRenderer.ts @@ -3,23 +3,17 @@ 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 { - canvas: HTMLCanvasElement | OffscreenCanvas + readonly canvas = document.createElement('canvas') readonly renderer: THREE.WebGLRenderer private animationFrameId?: number - private timeoutId?: number private lastRenderTime = 0 - - private previousCanvasWidth = 0 - private previousCanvasHeight = 0 - private currentWidth = 0 - private currentHeight = 0 - + private previousWindowWidth = window.innerWidth + private previousWindowHeight = window.innerHeight private renderedFps = 0 private fpsInterval: any - private readonly stats: TopRightStats | undefined + private readonly stats: TopRightStats private paused = false disconnected = false preRender = () => { } @@ -29,18 +23,10 @@ export class DocumentRenderer { droppedFpsPercentage: number config: GraphicsBackendConfig onRender = [] as Array<(sizeChanged: boolean) => void> - inWorldRenderingConfig: WorldRendererConfig | undefined - constructor (initOptions: GraphicsInitOptions, public externalCanvas?: OffscreenCanvas) { + constructor (initOptions: GraphicsInitOptions) { 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, @@ -49,25 +35,17 @@ export class DocumentRenderer { powerPreference: this.config.powerPreference }) } catch (err) { - initOptions.callbacks.displayCriticalError(new Error(`Failed to create WebGL context, not possible to render (restart browser): ${err.message}`)) + initOptions.displayCriticalError(new Error(`Failed to create WebGL context, not possible to render (restart browser): ${err.message}`)) throw err } this.renderer.outputColorSpace = THREE.LinearSRGBColorSpace - if (!externalCanvas) { - this.updatePixelRatio() - } - this.sizeUpdated() - // Initialize previous dimensions - this.previousCanvasWidth = this.canvas.width - this.previousCanvasHeight = this.canvas.height + this.updatePixelRatio() + this.updateSize() + this.addToPage() - const supportsWebGL2 = 'WebGL2RenderingContext' in window - // Only initialize stats and DOM-related features in main thread - if (!externalCanvas && supportsWebGL2) { - this.stats = new TopRightStats(this.canvas as HTMLCanvasElement, this.config.statsVisible) - this.setupFpsTracking() - } + this.stats = new TopRightStats(this.canvas, this.config.statsVisible) + this.setupFpsTracking() this.startRenderLoop() } @@ -79,33 +57,15 @@ export class DocumentRenderer { this.renderer.setPixelRatio(pixelRatio) } - sizeUpdated () { - this.renderer.setSize(this.currentWidth, this.currentHeight, false) + updateSize () { + this.renderer.setSize(window.innerWidth, window.innerHeight) } private addToPage () { - 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 - } - } + this.canvas.id = 'viewer-canvas' + this.canvas.style.width = '100%' + this.canvas.style.height = '100%' + document.body.appendChild(this.canvas) } private setupFpsTracking () { @@ -119,17 +79,22 @@ 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 + if (this.paused) return // Handle FPS limiting if (this.config.fpsLimit) { @@ -145,40 +110,35 @@ export class DocumentRenderer { } let sizeChanged = false - this.updateCanvasSize() - if (this.previousCanvasWidth !== this.currentWidth || this.previousCanvasHeight !== this.currentHeight) { - this.previousCanvasWidth = this.currentWidth - this.previousCanvasHeight = this.currentHeight - this.sizeUpdated() + if (this.previousWindowWidth !== window.innerWidth || this.previousWindowHeight !== window.innerHeight) { + this.previousWindowWidth = window.innerWidth + this.previousWindowHeight = window.innerHeight + this.updateSize() sizeChanged = true } - this.frameRender(sizeChanged) + 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() - // Update stats visibility each frame (main thread only) + // Update stats visibility each frame if (this.config.statsVisible !== undefined) { - this.stats?.setVisibility(this.config.statsVisible) + this.stats.setVisibility(this.config.statsVisible) } } animate() } - frameRender (sizeChanged: boolean) { - this.preRender() - this.stats?.markStart() - tween.update() - if (!globalThis.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 } @@ -188,15 +148,10 @@ export class DocumentRenderer { if (this.animationFrameId) { cancelAnimationFrame(this.animationFrameId) } - if (this.timeoutId) { - clearTimeout(this.timeoutId) - } - if (this.canvas instanceof HTMLCanvasElement) { - this.canvas.remove() - } - clearInterval(this.fpsInterval) - this.stats?.dispose() + this.canvas.remove() this.renderer.dispose() + clearInterval(this.fpsInterval) + this.stats.dispose() } } @@ -289,40 +244,3 @@ 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 fad30182..35872deb 100644 --- a/renderer/viewer/three/entities.ts +++ b/renderer/viewer/three/entities.ts @@ -1,10 +1,11 @@ //@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 { PlayerAnimation, PlayerObject } from 'skinview3d' -import { inferModelType, loadCapeToCanvas, loadEarsToCanvasFromSkin } from 'skinview-utils' +import { PlayerObject, PlayerAnimation } from 'skinview3d' +import { loadSkinToCanvas, loadEarsToCanvasFromSkin, inferModelType, loadCapeToCanvas, loadImage } from 'skinview-utils' // todo replace with url import { degreesToRadians } from '@nxg-org/mineflayer-tracker/lib/mathUtils' import { NameTagObject } from 'skinview3d/libs/nametag' @@ -12,28 +13,25 @@ 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 { Team } from 'mineflayer' -import PrismarineChatLoader from 'prismarine-chat' +import { Vec3 } from 'vec3' import { EntityMetadataVersions } from '../../../src/mcDataTypes' 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 { loadSkinImage, getLookupUrl, stevePngUrl, steveTexture } from '../lib/utils/skins' +import { loadTexture } 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' -import { disposeObject, loadTexture, loadThreeJsTextureFromUrl } from './threeJsUtils' -import { armorModel, armorTextures, elytraTexture } from './entity/armorModels' +import { disposeObject } from './threeJsUtils' +import { armorModel, armorTextures } from './entity/armorModels' import { WorldRendererThree } from './worldrendererThree' -export const steveTexture = loadThreeJsTextureFromUrl(stevePngUrl) - export const TWEEN_DURATION = 120 +type PlayerObjectType = PlayerObject & { animation?: PlayerAnimation } + function convert2sComplementToHex (complement: number) { if (complement < 0) { complement = (0xFF_FF_FF_FF + complement + 1) >>> 0 @@ -93,11 +91,8 @@ function getUsernameTexture ({ username, nameTagBackgroundColor = 'rgba(0, 0, 0, 0.3)', nameTagTextOpacity = 255 -}: any, { fontFamily = 'mojangles' }: any, version: string) { - const canvas = createCanvas(64, 64) - - const PrismarineChat = PrismarineChatLoader(version) - +}: 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') @@ -105,39 +100,38 @@ function getUsernameTexture ({ const padding = 5 ctx.font = `${fontSize}px ${fontFamily}` - const plainLines = String(typeof username === 'string' ? username : new PrismarineChat(username).toString()).split('\n') + const lines = String(username).split('\n') + let textWidth = 0 - for (const line of plainLines) { + 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) * plainLines.length + canvas.height = (fontSize + padding) * lines.length ctx.fillStyle = nameTagBackgroundColor ctx.fillRect(0, 0, canvas.width, canvas.height) - ctx.globalAlpha = nameTagTextOpacity / 255 - - renderComponent(username, PrismarineChat, canvas, fontSize, 'white', -padding + fontSize) - - ctx.globalAlpha = 1 + 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) + } return canvas } -const addNametag = (entity, options: { fontFamily: string }, mesh, version: string) => { - for (const c of mesh.children) { - if (c.name === 'nametag') { - c.removeFromParent() - } - } +const addNametag = (entity, options, mesh) => { if (entity.username !== undefined) { - const canvas = getUsernameTexture(entity, options, version) + if (mesh.children.some(c => c.name === 'nametag')) return // todo update + const canvas = getUsernameTexture(entity, options) const tex = new THREE.Texture(canvas) tex.needsUpdate = true - let nameTag: THREE.Object3D + let nameTag if (entity.nameTagFixed) { const geometry = new THREE.PlaneGeometry() const material = new THREE.MeshBasicMaterial({ map: tex }) @@ -167,7 +161,6 @@ const addNametag = (entity, options: { fontFamily: string }, mesh, version: stri nameTag.name = 'nametag' mesh.add(nameTag) - return nameTag } } @@ -176,7 +169,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, 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 @@ -184,7 +177,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, world.version) + addNametag(entity, options, e.mesh) return e.mesh } } catch (err) { @@ -202,22 +195,22 @@ function getEntityMesh (entity: import('prismarine-entity').Entity & { delete?: addNametag({ username: entity.name, height: entity.height, - }, options, cube, world.version) + }, options, cube) } return cube } export type SceneEntity = THREE.Object3D & { - playerObject?: PlayerObjectType + playerObject?: PlayerObject & { + animation?: PlayerAnimation + } username?: string uuid?: string additionalCleanup?: () => void - originalEntity: import('prismarine-entity').Entity & { delete?; pos?, name, team?: Team } } export class Entities { entities = {} as Record - playerEntity: SceneEntity | null = null // Special entity for the player in third person entitiesOptions = { fontFamily: 'mojangles' } @@ -242,50 +235,9 @@ 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 = () => { } - 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 () { @@ -294,27 +246,6 @@ export class Entities { disposeObject(mesh) } this.entities = {} - - // Clean up player entity - if (this.playerEntity) { - this.worldRenderer.scene.remove(this.playerEntity) - disposeObject(this.playerEntity) - this.playerEntity = null - } - } - - 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) { @@ -347,13 +278,12 @@ export class Entities { } const dt = this.clock.getDelta() - const botPos = this.worldRenderer.viewerChunkPosition - const VISIBLE_DISTANCE = 10 * 10 + const botPos = this.worldRenderer.viewerPosition + const VISIBLE_DISTANCE = 8 * 8 - // 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 + for (const entityId of Object.keys(this.entities)) { + const entity = this.entities[entityId] + const playerObject = entity.playerObject as PlayerObjectType | undefined // Update animations if (playerObject?.animation) { @@ -367,116 +297,19 @@ export class Entities { const dz = entity.position.z - botPos.z const distanceSquared = dx * dx + dy * dy + dz * dz - // Entity is visible if within 20 blocks OR in a finished chunk - entity.visible = !!(distanceSquared < VISIBLE_DISTANCE || this.worldRenderer.shouldObjectVisible(entity)) + // 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}` - 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) - } - }) - } + // Entity is visible if within 16 blocks OR in a finished chunk + entity.visible = !!(distanceSquared < VISIBLE_DISTANCE || this.worldRenderer.finishedChunks[chunkKey]) } } } - 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) { - if (this.playerEntity?.originalEntity.id === entityId) return this.playerEntity?.playerObject - const playerObject = this.entities[entityId]?.playerObject + const playerObject = this.entities[entityId]?.playerObject as PlayerObjectType | undefined return playerObject } @@ -488,21 +321,16 @@ 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) { - 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 - if (typeof capeUrl === 'string') this.uuidPerSkinUrlsCache[uuidCache].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.uuidPerSkinUrlsCache[uuidCache]?.skinUrl ?? skinUrl + skinUrl = this.uuidPerSkinUrlsCache[uuid]?.skinUrl ?? skinUrl } - capeUrl ??= this.uuidPerSkinUrlsCache[uuidCache]?.capeUrl + capeUrl ??= this.uuidPerSkinUrlsCache[uuid]?.capeUrl } const playerObject = this.getPlayerObject(entityId) @@ -510,21 +338,15 @@ export class Entities { if (skinUrl === true) { if (!username) return - const newSkinUrl = await loadSkinFromUsername(username, 'skin') - if (!this.getPlayerObject(entityId)) return - if (!newSkinUrl) return - skinUrl = newSkinUrl + skinUrl = getLookupUrl(username, 'skin') } 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(async () => { + void this.loadAndApplySkin(entityId, skinUrl, renderEars).then(() => { if (capeUrl) { if (capeUrl === true && username) { - const newCapeUrl = await loadSkinFromUsername(username, 'cape') - if (!this.getPlayerObject(entityId)) return - if (!newCapeUrl) return - capeUrl = newCapeUrl + capeUrl = getLookupUrl(username, 'cape') } if (typeof capeUrl === 'string') { void this.loadAndApplyCape(entityId, capeUrl) @@ -549,16 +371,16 @@ export class Entities { if (!playerObject) return try { - let playerCustomSkinImage: ImageBitmap | undefined + let playerCustomSkinImage: HTMLImageElement | undefined playerObject = this.getPlayerObject(entityId) if (!playerObject) return let skinTexture: THREE.Texture - let skinCanvas: OffscreenCanvas + let skinCanvas: HTMLCanvasElement if (skinUrl === stevePngUrl) { skinTexture = await steveTexture - const canvas = createCanvas(64, 64) + 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) @@ -632,72 +454,24 @@ 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') { - // 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 (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 regular entities + playAnimation (entityPlayerId, animation: 'walking' | 'running' | 'oneSwing' | 'idle') { const playerObject = this.getPlayerObject(entityPlayerId) - if (playerObject) { - if (animation === 'oneSwing') { - if (!(playerObject.animation instanceof WalkingGeneralSwing)) throw new Error('Expected WalkingGeneralSwing') - playerObject.animation.swingArm() - return - } + if (!playerObject) 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' - } - } + if (animation === 'oneSwing') { + if (!(playerObject.animation instanceof WalkingGeneralSwing)) throw new Error('Expected WalkingGeneralSwing') + playerObject.animation.swingArm() 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' - } + 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.isRunning = animation === 'running' } } + } parseEntityLabel (jsonLike) { @@ -718,13 +492,13 @@ export class Entities { return typeof component === 'string' ? component : component.text ?? '' } - getItemMesh (item, specificProps: ItemSpecificContextProperties, faceCamera = false, previousModel?: string) { + 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 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 @@ -737,41 +511,60 @@ export class Entities { return { mesh: outerGroup, isBlock: true, + itemsTexture: null, + itemsTextureFlipped: null, modelName: textureUv.modelName, } } - // Render proper 3D model for items + // 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, su, sv } = textureUv - 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 + 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 + 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 SCALE = 1 if (specificProps['minecraft:display_context'] === 'ground') { SCALE = 0.5 } else if (specificProps['minecraft:display_context'] === 'thirdperson') { SCALE = 6 } - result.mesh.scale.set(SCALE, SCALE, SCALE) - + mesh.scale.set(SCALE, SCALE, SCALE) return { - mesh: result.mesh, + mesh, isBlock: false, + itemsTexture, + itemsTextureFlipped, modelName: textureUv.modelName, - cleanup: result.cleanup } } } @@ -786,7 +579,9 @@ export class Entities { } } - update (entity: SceneEntity['originalEntity'], overrides) { + 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`}` @@ -797,7 +592,6 @@ 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 @@ -813,91 +607,78 @@ export class Entities { return } - let mesh: THREE.Object3D | undefined + let mesh 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' || 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) + const group = new THREE.Group() + if (entity.name === 'item') { + const item = 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' || entity.type === 'projectile') { - mesh.scale.set(0.5, 0.5, 0.5) - 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) - } + mesh.scale.set(0.5, 0.5, 0.5) + mesh.position.set(0, 0.2, 0) // set faces // mesh.position.set(targetPos.x + 0.5 + 2, targetPos.y + 0.5, targetPos.z + 0.5) // viewer.scene.add(mesh) - if (entity.name === 'item') { - const clock = new THREE.Clock() - mesh.onBeforeRender = () => { - const delta = clock.getDelta() - mesh!.rotation.y += delta - } + const clock = new THREE.Clock() + 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 - if (object.cleanup) { - object.cleanup() - } + object.itemsTexture?.dispose() + object.itemsTextureFlipped?.dispose() } } } } else if (isPlayerModel) { + // CREATE NEW PLAYER ENTITY const wrapper = new THREE.Group() - const playerObject = this.setupPlayerObject(entity, wrapper, overrides) - group.playerObject = playerObject - mesh = wrapper + const playerObject = new PlayerObject() as PlayerObjectType + 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) if (entity.username) { - 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) - } + // 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 + + //@ts-expect-error + wrapper.add(nameTag) } + + //@ts-expect-error + 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, customModel: entity['customModel'] }) + mesh = getEntityMesh(entity, this.worldRenderer, this.entitiesOptions, overrides) } if (!mesh) return mesh.name = 'mesh' // set initial position so there are no weird jumps update after - const pos = entity.pos ?? entity.position - group.position.set(pos.x, pos.y, pos.z) + group.position.set(entity.pos.x, entity.pos.y, entity.pos.z) // todo use width and height instead const boxHelper = new THREE.BoxHelper( @@ -921,7 +702,7 @@ export class Entities { this.onAddEntity(entity) if (isPlayerModel) { - void this.updatePlayerSkin(entity.id, entity.username, overrides?.texture ? entity.uuid : undefined, overrides?.texture || stevePngUrl) + this.updatePlayerSkin(entity.id, entity.username, entity.uuid, overrides?.texture || stevePngUrl) } this.setDebugMode(this.debugMode, group) this.setRendering(this.currentlyRendering, group) @@ -929,13 +710,22 @@ export class Entities { mesh = e.children.find(c => c.name === 'mesh') } - // Update equipment - this.updateEntityEquipment(e, entity) + // check if entity has armor + if (entity.equipment) { + this.addItemModel(e, 'left', entity.equipment[0]) + this.addItemModel(e, 'right', entity.equipment[1]) + 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) - 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 ?? []) { + //@ts-expect-error + // set visibility + const isInvisible = entity.metadata?.[0] & 0x20 + for (const child of mesh.children ?? []) { if (child.name !== 'nametag') { child.visible = !isInvisible } @@ -950,22 +740,21 @@ export class Entities { // entity specific meta const textDisplayMeta = getSpecificEntityMetadata('text_display', entity) const displayTextRaw = textDisplayMeta?.text || meta.custom_name_visible && meta.custom_name - if (entity.name !== 'player' && displayTextRaw) { + 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 && (parseInt(textDisplayMeta.style_flags, 10) & 0x04) === 0) ? toRgba(textDisplayMeta.background_color) : undefined + 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: typeof displayTextRaw === 'string' ? mojangson.simplify(mojangson.parse(displayTextRaw)) : nbt.simplify(displayTextRaw), - nameTagBackgroundColor, nameTagTextOpacity, nameTagFixed, + { ...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, - mesh, - this.worldRenderer.version + mesh ) } @@ -975,8 +764,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 { @@ -1045,9 +834,7 @@ 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!.position.set(0, 0, -0.5) - + mesh.scale.set(1, 1, 1) e.rotation.x = -entity.pitch e.children.find(c => { if (c.name.startsWith('map_')) { @@ -1064,33 +851,25 @@ 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) - // Handle map rotation (4 possibilities, 90° increments) + mesh.scale.set(16 / 12, 16 / 12, 1) 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.05) - // itemMesh.mesh.position.set(0, 0, 0.43) + 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) @@ -1099,11 +878,17 @@ export class Entities { } } - if (entity.username !== undefined) { + if (entity.username) { e.username = entity.username } - this.updateNameTagVisibility(e) + 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) } @@ -1122,39 +907,38 @@ export class Entities { } if (e?.playerObject && overrides?.rotation?.head) { - const { playerObject } = e + const playerObject = e.playerObject as PlayerObjectType 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() - maybeRenderPlayerSkin (entityId: string) { - let mesh = this.entities[entityId] - if (entityId === 'player_entity') { - mesh = this.playerEntity! - entityId = this.playerEntity?.originalEntity.id as any - } + loadedSkinEntityIds = new Set() + maybeRenderPlayerSkin (entity: import('prismarine-entity').Entity) { + const mesh = this.entities[entity.id] if (!mesh) return - if (!mesh.playerObject) return - if (!mesh.visible) return - + if (!mesh.playerObject || !this.worldRenderer.worldRendererConfig.fetchPlayerSkins) return const MAX_DISTANCE_SKIN_LOAD = 128 - const cameraPos = this.worldRenderer.cameraObject.position - const distance = mesh.position.distanceTo(cameraPos) + 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.loadedSkinEntityIds.has(String(entityId))) return - void this.updatePlayerSkin(entityId, mesh.playerObject.realUsername, mesh.playerObject.realPlayerUuid, true, true) + 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 onRemoveEntity (entity: import('prismarine-entity').Entity) { - this.loadedSkinEntityIds.delete(entity.id.toString()) + this.loadedSkinEntityIds.delete(entity.id) } updateMap (mapNumber: string | number, data: string) { @@ -1172,20 +956,6 @@ 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 @@ -1216,7 +986,6 @@ 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}` @@ -1240,13 +1009,11 @@ export class Entities { return texture } - addItemModel (entityMesh: SceneEntity, hand: 'left' | 'right', item: Item, isPlayer = false) { - const bedrockParentName = `bone_${hand}item` - const itemName = `custom_item_${hand}` - + addItemModel (entityMesh: SceneEntity, hand: 'left' | 'right', item: Item) { + const parentName = `bone_${hand}item` // remove existing item entityMesh.traverse(c => { - if (c.name === itemName) { + if (c.parent?.name.toLowerCase() === parentName) { c.removeFromParent() if (c['additionalCleanup']) c['additionalCleanup']() } @@ -1258,13 +1025,12 @@ export class Entities { }) if (itemObject?.mesh) { entityMesh.traverse(c => { - if (c.name.toLowerCase() === bedrockParentName || c.name === `${hand}Arm`) { + if (c.name.toLowerCase() === parentName) { const group = new THREE.Object3D() group['additionalCleanup'] = () => { // important: avoid texture memory leak and gpu slowdown - if (itemObject.cleanup) { - itemObject.cleanup() - } + itemObject.itemsTexture?.dispose() + itemObject.itemsTextureFlipped?.dispose() } const itemMesh = itemObject.mesh group.rotation.z = -Math.PI / 16 @@ -1275,18 +1041,7 @@ 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) } }) @@ -1297,7 +1052,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 && child.material.clone) { + if (child instanceof THREE.Mesh) { const clonedMaterial = child.material.clone() clonedMaterial.dispose() child.material = child.material.clone() @@ -1310,64 +1065,6 @@ export class Entities { }) } } - - 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.backEquipment === 'elytra') { - void this.loadAndApplyCape(entity.id, elytraTexture) - } - if (playerObject.cape.map === null) { - playerObject.cape.visible = false - } - } - } } function getGeneralEntitiesMetadata (entity: { name; metadata }): Partial> { @@ -1408,11 +1105,6 @@ 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) @@ -1425,7 +1117,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) @@ -1437,7 +1129,7 @@ function addArmorModel (worldRenderer: WorldRendererThree, entityMesh: THREE.Obj let material if (mesh) { material = mesh.material - void loadTexture(texturePath, texture => { + loadTexture(texturePath, texture => { texture.magFilter = THREE.NearestFilter texture.minFilter = THREE.NearestFilter texture.flipY = false @@ -1447,16 +1139,6 @@ 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) { @@ -1481,6 +1163,12 @@ 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/entity/EntityMesh.ts b/renderer/viewer/three/entity/EntityMesh.ts index 229da6d5..488a0f86 100644 --- a/renderer/viewer/three/entity/EntityMesh.ts +++ b/renderer/viewer/three/entity/EntityMesh.ts @@ -2,11 +2,10 @@ 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' -import { loadTexture } from '../threeJsUtils' +import { loadTexture } from '../../lib/utils' import { WorldRendererThree } from '../worldrendererThree' import entities from './entities.json' import { externalModels } from './objModels' @@ -238,11 +237,10 @@ 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.blocksAtlasJson.textures[blockName] + const textureInfo = worldRenderer.resourcesManager.currentResources!.blocksAtlasParser.getTextureInfo(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}`) @@ -458,7 +456,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': ocelotPng, + 'ocelot': `textures/${version}/entity/cat/ocelot.png`, 'arrow': arrowTexture, 'spectral_arrow': spectralArrowTexture, 'tipped_arrow': tippedArrowTexture @@ -529,6 +527,12 @@ 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' } @@ -547,4 +551,4 @@ export class EntityMesh { } } } -globalThis.EntityMesh = EntityMesh +window.EntityMesh = EntityMesh diff --git a/renderer/viewer/three/entity/animations.js b/renderer/viewer/three/entity/animations.js index 3295556f..a6cabdbb 100644 --- a/renderer/viewer/three/entity/animations.js +++ b/renderer/viewer/three/entity/animations.js @@ -1,4 +1,3 @@ -//@ts-check import { PlayerAnimation } from 'skinview3d' export class WalkingGeneralSwing extends PlayerAnimation { @@ -7,7 +6,6 @@ export class WalkingGeneralSwing extends PlayerAnimation { isRunning = false isMoving = true - isCrouched = false _startArmSwing @@ -17,7 +15,7 @@ export class WalkingGeneralSwing extends PlayerAnimation { animate(player) { // Multiply by animation's natural speed - let t = 0 + let t const updateT = () => { if (!this.isMoving) { t = 0 @@ -32,8 +30,6 @@ 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 @@ -54,12 +50,11 @@ 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 - HitAnimation.animate((this.progress - this._startArmSwing), player, this.isMoving) + 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 - if (tHand > Math.PI + Math.PI) { + if (tHand > Math.PI + Math.PI * 0.5) { this._startArmSwing = null player.skin.rightArm.rotation.z = 0 } @@ -106,66 +101,3 @@ 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/renderer/viewer/three/entity/armorModels.ts b/renderer/viewer/three/entity/armorModels.ts index 3681344c..3a87f8db 100644 --- a/renderer/viewer/three/entity/armorModels.ts +++ b/renderer/viewer/three/entity/armorModels.ts @@ -14,7 +14,6 @@ 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 = { diff --git a/renderer/viewer/three/graphicsBackend.ts b/renderer/viewer/three/graphicsBackend.ts index 04cb00ca..14534d40 100644 --- a/renderer/viewer/three/graphicsBackend.ts +++ b/renderer/viewer/three/graphicsBackend.ts @@ -3,17 +3,13 @@ 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 { ResourcesManager } from '../../../src/resourcesManager' 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 -globalThis.THREE = THREE +window.THREE = THREE const getBackendMethods = (worldRenderer: WorldRendererThree) => { return { @@ -25,7 +21,7 @@ const getBackendMethods = (worldRenderer: WorldRendererThree) => { updatePlayerSkin: worldRenderer.entities.updatePlayerSkin.bind(worldRenderer.entities), changeHandSwingingState: worldRenderer.changeHandSwingingState.bind(worldRenderer), getHighestBlocks: worldRenderer.getHighestBlocks.bind(worldRenderer), - reloadWorld: worldRenderer.reloadWorld.bind(worldRenderer), + rerenderAllChunks: worldRenderer.rerenderAllChunks.bind(worldRenderer), addMedia: worldRenderer.media.addMedia.bind(worldRenderer.media), destroyMedia: worldRenderer.media.destroyMedia.bind(worldRenderer.media), @@ -44,12 +40,6 @@ 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), - - // New method for updating skybox - setSkyboxImage: worldRenderer.skyboxRenderer.setSkyboxImage.bind(worldRenderer.skyboxRenderer) } } @@ -64,39 +54,32 @@ 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(location.search) - if (qs.get('debugEntities')) { - const fullResourceManager = initOptions.resourcesManager as ResourcesManager - fullResourceManager.currentConfig = { version: qs.get('version') || supportedVersions.at(-1)!, noInventoryGui: true } - await fullResourceManager.updateAssetsData({ }) - - displayEntitiesDebugList(fullResourceManager.currentConfig.version) - return - } - if (!panoramaRenderer) { panoramaRenderer = new PanoramaRenderer(documentRenderer, initOptions, !!process.env.SINGLE_FILE_BUILD_MODE) - globalThis.panoramaRenderer = panoramaRenderer + window.panoramaRenderer = panoramaRenderer callModsMethod('panoramaCreated', panoramaRenderer) await panoramaRenderer.start() callModsMethod('panoramaReady', panoramaRenderer) } } + let version = '' + const prepareResources = async (ver: string, progressReporter: ProgressReporter): Promise => { + version = ver + await initOptions.resourcesManager.updateAssetsData({ }) + } + const startWorld = async (displayOptions: DisplayWorldOptions) => { if (panoramaRenderer) { panoramaRenderer.dispose() 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) } @@ -127,9 +110,6 @@ 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/renderer/viewer/three/holdingBlock.ts b/renderer/viewer/three/holdingBlock.ts index f9d00f0e..cf294016 100644 --- a/renderer/viewer/three/holdingBlock.ts +++ b/renderer/viewer/three/holdingBlock.ts @@ -1,15 +1,14 @@ 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' -import { MovementState, PlayerStateRenderer } from '../lib/basePlayerState' +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 { getMyHand } from './hand' import { WorldRendererThree } from './worldrendererThree' import { disposeObject } from './threeJsUtils' @@ -116,56 +115,41 @@ export default class HoldingBlock { offHandModeLegacy = false swingAnimator: HandSwingAnimator | undefined + playerState: IPlayerState config: WorldRendererConfig constructor (public worldRenderer: WorldRendererThree, public offHand = false) { this.initCameraGroup() - this.worldRenderer.onReactivePlayerStateUpdated('heldItemMain', () => { - if (!this.offHand) { - this.updateItem() - } - }, false) - this.worldRenderer.onReactivePlayerStateUpdated('heldItemOff', () => { - if (this.offHand) { - this.updateItem() - } - }, false) + 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 if (!this.offHand) { - // 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.worldRenderer.playerStateReactive.playerSkin, this.worldRenderer.playerStateReactive.onlineMode ? this.worldRenderer.playerStateReactive.username : undefined) - }, - this.worldRenderer.playerStateReactive, - 'playerSkin', - (newHand) => { - if (newHand) { - this.playerHand = newHand - // trigger update - this.updateItem() - } - }, - (oldHand) => { - disposeObject(oldHand!, true) - } - ) - }) + // 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) return - const item = this.offHand ? this.worldRenderer.playerStateReactive.heldItemOff : this.worldRenderer.playerStateReactive.heldItemMain + if (!this.ready || !this.playerState.getHeldItem) return + const item = this.playerState.getHeldItem(this.offHand) if (item) { void this.setNewItem(item) } else if (this.offHand) { @@ -302,7 +286,6 @@ export default class HoldingBlock { } isDifferentItem (block: HandItemBlock | undefined) { - const Item = PrismarineItem(this.worldRenderer.version) if (!this.lastHeldItem) { return true } @@ -310,7 +293,7 @@ export default class HoldingBlock { return true } // eslint-disable-next-line sonarjs/prefer-single-boolean-return - if (!Item.equal(this.lastHeldItem.fullItem, block?.fullItem ?? {}) || JSON.stringify(this.lastHeldItem.fullItem.components) !== JSON.stringify(block?.fullItem?.components)) { + if (JSON.stringify(this.lastHeldItem.fullItem) !== JSON.stringify(block?.fullItem ?? '{}')) { return true } @@ -355,9 +338,9 @@ export default class HoldingBlock { itemId: handItem.id, }, { 'minecraft:display_context': 'firstperson', - 'minecraft:use_duration': this.worldRenderer.playerStateReactive.itemUsageTicks, - 'minecraft:using_item': !!this.worldRenderer.playerStateReactive.itemUsageTicks, - }, false, this.lastItemModelName) + 'minecraft:use_duration': this.playerState.getItemUsageTicks?.(), + 'minecraft:using_item': !!this.playerState.getItemUsageTicks?.(), + }, this.lastItemModelName) if (result) { const { mesh: itemMesh, isBlock, modelName } = result if (isBlock) { @@ -473,7 +456,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.worldRenderer.playerStateReactive) + this.idleAnimator = new HandIdleAnimator(this.holdingBlockInnerGroup, this.playerState) } } @@ -554,7 +537,7 @@ class HandIdleAnimator { private readonly debugGui: DebugGui - constructor (public handMesh: THREE.Object3D, public playerState: PlayerStateRenderer) { + constructor (public handMesh: THREE.Object3D, public playerState: IPlayerState) { this.handMesh = handMesh this.globalTime = 0 this.currentState = 'NOT_MOVING' @@ -708,7 +691,7 @@ class HandIdleAnimator { // Check for state changes from player state if (this.playerState) { - const newState = this.playerState.movementState + const newState = this.playerState.getMovementState() if (newState !== this.targetState) { this.setState(newState) } diff --git a/renderer/viewer/three/itemMesh.ts b/renderer/viewer/three/itemMesh.ts deleted file mode 100644 index 3fa069b9..00000000 --- a/renderer/viewer/three/itemMesh.ts +++ /dev/null @@ -1,427 +0,0 @@ -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, 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.from({ length: h + 1 }, () => Array.from({ length: w + 1 }, () => null)) - const backVertices: Array> = 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.04 } = 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) -} diff --git a/renderer/viewer/three/panorama.ts b/renderer/viewer/three/panorama.ts index 254b980c..682d25d2 100644 --- a/renderer/viewer/three/panorama.ts +++ b/renderer/viewer/three/panorama.ts @@ -6,14 +6,11 @@ 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 { 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' -import { PANORAMA_VERSION } from './panoramaShared' const panoramaFiles = [ 'panorama_3.png', // right (+x) @@ -34,12 +31,10 @@ export class PanoramaRenderer { private readonly abortController = new AbortController() private worldRenderer: WorldRendererCommon | WorldRendererThree | undefined public WorldRendererClass = WorldRendererThree - public startTimes = new Map() constructor (private readonly documentRenderer: DocumentRenderer, private readonly options: GraphicsInitOptions, private readonly doWorldBlocksPanorama = false) { this.scene = new THREE.Scene() - // #324568 - this.scene.background = new THREE.Color(0x32_45_68) + this.scene.background = new THREE.Color(this.options.config.sceneBackground) // Add ambient light this.ambientLight = new THREE.AmbientLight(0xcc_cc_cc) @@ -51,7 +46,7 @@ export class PanoramaRenderer { this.directionalLight.castShadow = true this.scene.add(this.directionalLight) - this.camera = new THREE.PerspectiveCamera(85, this.documentRenderer.canvas.width / this.documentRenderer.canvas.height, 0.05, 1000) + 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) } @@ -66,57 +61,38 @@ export class PanoramaRenderer { this.documentRenderer.render = (sizeChanged = false) => { if (sizeChanged) { - this.camera.aspect = this.documentRenderer.canvas.width / this.documentRenderer.canvas.height + this.camera.aspect = window.innerWidth / window.innerHeight 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 - - // void this.debugImageInFrontOfCamera() for (const file of panoramaFiles) { - const load = async () => { - const { texture } = loadThreeJsTextureFromUrlSync(join('background', file)) + 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 - ) + // 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 + texture.wrapS = THREE.ClampToEdgeWrapping // Changed from RepeatWrapping + texture.wrapT = THREE.ClampToEdgeWrapping // Changed from RepeatWrapping + 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 - }) - - // Start fade-in when texture is loaded - this.startTimes.set(material, Date.now()) - panorMaterials.push(material) - } - - void load() + panorMaterials.push(new THREE.MeshBasicMaterial({ + map: texture, + transparent: true, + side: THREE.DoubleSide, + depthWrite: false, + })) } const panoramaBox = new THREE.Mesh(panorGeo, panorMaterials) @@ -124,16 +100,6 @@ 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 = this.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() @@ -157,10 +123,9 @@ export class PanoramaRenderer { } async worldBlocksPanorama () { - const version = PANORAMA_VERSION - const fullResourceManager = this.options.resourcesManager as ResourcesManager - fullResourceManager.currentConfig = { version, noInventoryGui: true, } - await fullResourceManager.updateAssetsData({ }) + const version = '1.21.4' + this.options.resourcesManager.currentConfig = { version, noInventoryGui: true, } + await this.options.resourcesManager.updateAssetsData({ }) if (this.abortController.signal.aborted) return console.time('load panorama scene') const world = getSyncWorld(version) @@ -198,9 +163,9 @@ export class PanoramaRenderer { version, worldView, inWorldRenderingConfig: defaultWorldRendererConfig, - playerStateReactive: getInitialPlayerStateRenderer().reactive, - rendererState: getDefaultRendererState().reactive, - nonReactiveState: getDefaultRendererState().nonReactive + playerState: new BasePlayerState(), + rendererState: getDefaultRendererState(), + nonReactiveState: getDefaultRendererState() } ) if (this.worldRenderer instanceof WorldRendererThree) { diff --git a/renderer/viewer/three/panoramaShared.ts b/renderer/viewer/three/panoramaShared.ts deleted file mode 100644 index ad80367f..00000000 --- a/renderer/viewer/three/panoramaShared.ts +++ /dev/null @@ -1 +0,0 @@ -export const PANORAMA_VERSION = '1.21.4' diff --git a/renderer/viewer/three/renderSlot.ts b/renderer/viewer/three/renderSlot.ts deleted file mode 100644 index 321633eb..00000000 --- a/renderer/viewer/three/renderSlot.ts +++ /dev/null @@ -1,82 +0,0 @@ -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 & { resolvedModel: BlockModel } | null, - scale: number | null, - slice: number[] | null, - modelName: string | null, -} => { - 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', - slice: [x, y, atlas.tileSize, atlas.tileSize], - scale: 0.25, - blockData: null, - modelName: null - } - } - } - - 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, - blockData: null, - scale: null - } - } else { - // is block - return { - texture: 'blocks', - blockData: itemTexture, - modelName: itemModelName, - slice: null, - scale: null - } - } -} diff --git a/renderer/viewer/three/shadersThree.ts b/renderer/viewer/three/shadersThree.ts new file mode 100644 index 00000000..052b9009 --- /dev/null +++ b/renderer/viewer/three/shadersThree.ts @@ -0,0 +1,94 @@ +import { ShaderChunk } from 'three' + +// Original simple shader for non-animated blocks +export const BLOCK_VERTEX_SHADER = ` +#include +${ShaderChunk.logdepthbuf_pars_vertex} + +attribute vec3 color; + +varying vec2 vUv; +varying vec3 vColor; + +void main() { + vUv = uv; + vColor = color; + gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0); + + ${ShaderChunk.logdepthbuf_vertex} +} +` + +export const BLOCK_FRAGMENT_SHADER = ` +#include +${ShaderChunk.logdepthbuf_pars_fragment} + +uniform sampler2D map; +varying vec2 vUv; +varying vec3 vColor; + +void main() { + vec4 texColor = texture2D(map, vUv); + if (texColor.a < 0.1) discard; + gl_FragColor = vec4(vColor * texColor.rgb, texColor.a); + + ${ShaderChunk.logdepthbuf_fragment} +} +` + +// New shader for animated blocks +export const ANIMATED_BLOCK_VERTEX_SHADER = ` +#include +${ShaderChunk.logdepthbuf_pars_vertex} + +uniform float animationFrameHeight; +uniform float animationFrameIndex; +uniform float animationInterpolationFrameIndex; +uniform float animationInterpolation; + +attribute vec3 color; +varying vec2 vUv; +varying vec3 vColor; +varying float vAnimationInterpolation; + +void main() { + vUv = uv; + vColor = color; + vAnimationInterpolation = animationInterpolation; + gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0); + + ${ShaderChunk.logdepthbuf_vertex} +} +` + +export const ANIMATED_BLOCK_FRAGMENT_SHADER = ` +#include +${ShaderChunk.logdepthbuf_pars_fragment} + +uniform sampler2D map; +uniform float animationFrameHeight; +uniform float animationFrameIndex; +uniform float animationInterpolationFrameIndex; + +varying vec2 vUv; +varying vec3 vColor; +varying float vAnimationInterpolation; + +void main() { + // Calculate UV coordinates for current frame + vec2 currentFrameUv = vec2(vUv.x, animationFrameHeight * (vUv.y + animationFrameIndex)); + vec4 currentFrame = texture2D(map, currentFrameUv); + + // If interpolation is enabled, calculate UV for next frame and mix + if (vAnimationInterpolation > 0.0) { + vec2 nextFrameUv = vec2(vUv.x, animationFrameHeight * (vUv.y + animationInterpolationFrameIndex)); + vec4 nextFrame = texture2D(map, nextFrameUv); + currentFrame = mix(currentFrame, nextFrame, vAnimationInterpolation); + } + + if (currentFrame.a < 0.1) discard; + gl_FragColor = vec4(vColor * currentFrame.rgb, currentFrame.a); + + ${ShaderChunk.logdepthbuf_fragment} +} +` diff --git a/renderer/viewer/three/skyboxRenderer.ts b/renderer/viewer/three/skyboxRenderer.ts deleted file mode 100644 index fb9edae6..00000000 --- a/renderer/viewer/three/skyboxRenderer.ts +++ /dev/null @@ -1,406 +0,0 @@ -import * as THREE from 'three' -import { DebugGui } from '../lib/DebugGui' - -export const DEFAULT_TEMPERATURE = 0.75 - -export class SkyboxRenderer { - private texture: THREE.Texture | null = null - private mesh: THREE.Mesh | null = null - private skyMesh: THREE.Mesh | null = null - private voidMesh: THREE.Mesh | null = 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 - 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 () { - 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, 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) { - if (this.debugGui.visible) return - 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) { - 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() - } - - // Update default skybox setting - updateDefaultSkybox (defaultSkybox: boolean) { - if (this.debugGui.visible) return - this.defaultSkybox = defaultSkybox - 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 - - // 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) - } - - 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 - - // 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 - const targetBrightness = this.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 * 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( - skyColor.x * 0.2 + 0.04, - skyColor.y * 0.2 + 0.04, - skyColor.z * 0.6 + 0.1 - )) - } - - 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) - } - 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/threeJsSound.ts b/renderer/viewer/three/threeJsSound.ts index 699bb2cc..627cabf8 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, timeout?: number) => void + playSound: (position: { x: number, y: number, z: number }, path: string, volume?: number, pitch?: number) => void destroy: () => void } @@ -10,17 +10,7 @@ export class ThreeJsSound implements SoundSystem { audioListener: THREE.AudioListener | undefined private readonly activeSounds = new Set() private readonly audioContext: AudioContext | undefined - private readonly soundVolumes = new Map() - baseVolume = 1 - constructor (public worldRenderer: WorldRendererThree) { - worldRenderer.onWorldSwitched.push(() => { - this.stopAll() - }) - - worldRenderer.onReactiveConfigUpdated('volume', (volume) => { - this.changeVolume(volume) - }) } initAudioListener () { @@ -29,63 +19,41 @@ 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, timeout = 500) { + 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) - this.soundVolumes.set(sound, volume) const audioLoader = new THREE.AudioLoader() const start = Date.now() void audioLoader.loadAsync(path).then((buffer) => { - if (Date.now() - start > timeout) { - console.warn('Ignored playing sound', path, 'due to timeout:', timeout, 'ms <', Date.now() - start, 'ms') - return - } + if (Date.now() - start > 500) return // play sound.setBuffer(buffer) sound.setRefDistance(20) - sound.setVolume(volume * this.baseVolume) + 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) - if (sound.source) { - sound.disconnect() - } + sound.disconnect() this.activeSounds.delete(sound) - this.soundVolumes.delete(sound) audioLoader.manager.itemEnd(path) } sound.play() }) } - 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() + // 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() diff --git a/renderer/viewer/three/threeJsUtils.ts b/renderer/viewer/three/threeJsUtils.ts index cbef9065..5ae3b24f 100644 --- a/renderer/viewer/three/threeJsUtils.ts +++ b/renderer/viewer/three/threeJsUtils.ts @@ -1,6 +1,4 @@ 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 @@ -18,56 +16,3 @@ export const disposeObject = (obj: THREE.Object3D, cleanTextures = false) => { } } } - -let textureCache: Record = {} -let imagesPromises: Record> = {} - -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 { - const cached = textureCache[texture] - if (!cached) { - const { promise, resolve } = Promise.withResolvers() - 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/waypointSprite.ts b/renderer/viewer/three/waypointSprite.ts deleted file mode 100644 index 6a30e6db..00000000 --- a/renderer/viewer/three/waypointSprite.ts +++ /dev/null @@ -1,418 +0,0 @@ -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: 50, - 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, - metadata?: any, -}): 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) - - // Draw arrow shape - ctx.beginPath() - 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() - - // Use waypoint color for arrow - const colorHex = `#${color.toString(16).padStart(6, '0')}` - ctx.lineWidth = 6 - ctx.strokeStyle = 'black' - ctx.stroke() - 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) - 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 - - // 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 - 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) - } - } - - // 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 - 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 deleted file mode 100644 index 256ca6df..00000000 --- a/renderer/viewer/three/waypoints.ts +++ /dev/null @@ -1,140 +0,0 @@ -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 - metadata?: any -} - -export class WaypointsRenderer { - private readonly waypoints = new Map() - private readonly waypointScene = new THREE.Scene() - - constructor ( - private readonly worldRenderer: WorldRendererThree - ) { - } - - 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, 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) - - this.waypointScene.add(sprite.group) - - this.waypoints.set(id, { - id, x: x + 0.5, y: y + 0.5, z: z + 0.5, 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/world/cursorBlock.ts b/renderer/viewer/three/world/cursorBlock.ts index a03a6999..fe95c2c9 100644 --- a/renderer/viewer/three/world/cursorBlock.ts +++ b/renderer/viewer/three/world/cursorBlock.ts @@ -1,9 +1,10 @@ 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' @@ -28,24 +29,24 @@ export class CursorBlock { } cursorLineMaterial: LineMaterial - interactionLines: null | { blockPos: Vec3, mesh: THREE.Group, shapePositions: BlocksShapes | undefined } = null + interactionLines: null | { blockPos: Vec3, mesh: THREE.Group } = null prevColor: string | undefined 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++) { - void loadThreeJsTextureFromUrl(destroyStagesImages[i]).then((texture) => { - texture.magFilter = THREE.NearestFilter - texture.minFilter = THREE.NearestFilter - this.breakTextures.push(texture) - }) + const texture = loader.load(destroyStagesImages[i]) + texture.magFilter = THREE.NearestFilter + texture.minFilter = THREE.NearestFilter + this.breakTextures.push(texture) } const breakMaterial = new THREE.MeshBasicMaterial({ @@ -59,26 +60,18 @@ export class CursorBlock { this.blockBreakMesh.name = 'blockBreakMesh' this.worldRenderer.scene.add(this.blockBreakMesh) - this.worldRenderer.onReactivePlayerStateUpdated('gameMode', () => { + subscribeKey(this.worldRenderer.playerState.reactive, '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) - } - }) + + this.updateLineMaterial() } // Update functions updateLineMaterial () { - const inCreative = this.worldRenderer.playerStateReactive.gameMode === 'creative' + const inCreative = this.worldRenderer.displayOptions.playerState.reactive.gameMode === 'creative' const pixelRatio = this.worldRenderer.renderer.getPixelRatio() - if (this.cursorLineMaterial) { - this.cursorLineMaterial.dispose() - } this.cursorLineMaterial = new LineMaterial({ color: (() => { switch (this.worldRenderer.worldRendererConfig.highlightBlockColor) { @@ -125,8 +118,8 @@ export class CursorBlock { } } - setHighlightCursorBlock (blockPos: Vec3 | null, shapePositions?: BlocksShapes, force = false): void { - if (blockPos && this.interactionLines && blockPos.equals(this.interactionLines.blockPos) && !force) { + setHighlightCursorBlock (blockPos: Vec3 | null, shapePositions?: BlocksShapes): void { + if (blockPos && this.interactionLines && blockPos.equals(this.interactionLines.blockPos)) { return } if (this.interactionLines !== null) { @@ -150,7 +143,7 @@ export class CursorBlock { } this.worldRenderer.scene.add(group) group.visible = !this.cursorLinesHidden - this.interactionLines = { blockPos, mesh: group, shapePositions } + this.interactionLines = { blockPos, mesh: group } } render () { diff --git a/renderer/viewer/three/world/vr.ts b/renderer/viewer/three/world/vr.ts index ecf1b299..925ba0bb 100644 --- a/renderer/viewer/three/world/vr.ts +++ b/renderer/viewer/three/world/vr.ts @@ -4,9 +4,8 @@ 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, documentRenderer: DocumentRenderer) { +export async function initVR (worldRenderer: WorldRendererThree) { if (!('xr' in navigator) || !worldRenderer.worldRendererConfig.vrSupport) return const { renderer } = worldRenderer @@ -27,13 +26,12 @@ export async function initVR (worldRenderer: WorldRendererThree, documentRendere function enableVr () { renderer.xr.enabled = true - // renderer.xr.setReferenceSpaceType('local-floor') worldRenderer.reactiveState.preventEscapeMenu = true } function disableVr () { renderer.xr.enabled = false - worldRenderer.cameraGroupVr = undefined + worldRenderer.cameraObjectOverride = undefined worldRenderer.reactiveState.preventEscapeMenu = false worldRenderer.scene.remove(user) vrButtonContainer.hidden = true @@ -102,7 +100,7 @@ export async function initVR (worldRenderer: WorldRendererThree, documentRendere // hack for vr camera const user = new THREE.Group() - user.name = 'vr-camera-container' + user.add(worldRenderer.camera) worldRenderer.scene.add(user) const controllerModelFactory = new XRControllerModelFactory(new GLTFLoader()) const controller1 = renderer.xr.getControllerGrip(0) @@ -191,7 +189,7 @@ export async function initVR (worldRenderer: WorldRendererThree, documentRendere } // 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() @@ -199,15 +197,16 @@ export async function initVR (worldRenderer: WorldRendererThree, documentRendere // bot.entity.yaw = Math.atan2(-d.x, -d.z) // bot.entity.pitch = Math.asin(d.y) - documentRenderer.frameRender(false) + // todo ? + // bot.physics.stepHeight = 1 + + worldRenderer.render() }) renderer.xr.addEventListener('sessionstart', () => { - user.add(worldRenderer.camera) - worldRenderer.cameraGroupVr = user + worldRenderer.cameraObjectOverride = user }) renderer.xr.addEventListener('sessionend', () => { - worldRenderer.cameraGroupVr = undefined - user.remove(worldRenderer.camera) + worldRenderer.cameraObjectOverride = undefined }) worldRenderer.abortController.signal.addEventListener('abort', disableVr) diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts index 1b4e6152..117d631d 100644 --- a/renderer/viewer/three/worldrendererThree.ts +++ b/renderer/viewer/three/worldrendererThree.ts @@ -3,32 +3,71 @@ 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 { subscribeKey } from 'valtio/utils' import { renderSign } from '../sign-renderer' -import { DisplayWorldOptions, GraphicsInitOptions } from '../../../src/appViewer' +import { DisplayWorldOptions, GraphicsInitOptions, RendererReactiveState } from '../../../src/appViewer' import { chunkPos, sectionPos } from '../lib/simpleUtils' import { WorldRendererCommon } from '../lib/worldrendererCommon' -import { addNewStat } from '../lib/ui/newStats' +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 { getMyHand } from './hand' +import { sendVideoPlay, sendVideoStop } from '../../../src/customChannels' import HoldingBlock from './holdingBlock' import { getMesh } from './entity/EntityMesh' import { armorModel } from './entity/armorModels' -import { disposeObject, loadThreeJsTextureFromBitmap } from './threeJsUtils' +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' import { ThreeJsMedia } from './threeJsMedia' +import { BLOCK_VERTEX_SHADER, BLOCK_FRAGMENT_SHADER, ANIMATED_BLOCK_VERTEX_SHADER, ANIMATED_BLOCK_FRAGMENT_SHADER } from './shadersThree' import { Fountain } from './threeJsParticles' -import { WaypointsRenderer } from './waypoints' -import { DEFAULT_TEMPERATURE, SkyboxRenderer } from './skyboxRenderer' type SectionKey = string +class CustomBlockMaterial extends THREE.ShaderMaterial { + constructor () { + super({ + uniforms: { + map: { value: null } + }, + vertexShader: BLOCK_VERTEX_SHADER, + fragmentShader: BLOCK_FRAGMENT_SHADER, + transparent: true, + alphaTest: 0.1, + depthWrite: true, + depthTest: true, + side: THREE.FrontSide + }) + } +} + +class AnimatedBlockMaterial extends THREE.ShaderMaterial { + constructor () { + super({ + uniforms: { + map: { value: null }, + animationFrameHeight: { value: 1 }, + animationFrameIndex: { value: 0 }, + animationInterpolationFrameIndex: { value: 0 }, + animationInterpolation: { value: 0 } + }, + vertexShader: ANIMATED_BLOCK_VERTEX_SHADER, + fragmentShader: ANIMATED_BLOCK_FRAGMENT_SHADER, + transparent: true, + alphaTest: 0.1, + depthWrite: true, + depthTest: true, + side: THREE.FrontSide + }) + } +} + export class WorldRendererThree extends WorldRendererCommon { outputFormat = 'threeJs' as const sectionObjects: Record = {} @@ -36,22 +75,21 @@ export class WorldRendererThree extends WorldRendererCommon { signsCache = new Map() starField: StarField cameraSectionPos: Vec3 = new Vec3(0, 0, 0) - holdingBlock: HoldingBlock - holdingBlockLeft: HoldingBlock + holdingBlock: HoldingBlock | undefined + holdingBlockLeft: HoldingBlock | undefined scene = new THREE.Scene() ambientLight = new THREE.AmbientLight(0xcc_cc_cc) directionalLight = new THREE.DirectionalLight(0xff_ff_ff, 0.5) entities = new Entities(this) - cameraGroupVr?: THREE.Object3D - material = new THREE.MeshLambertMaterial({ vertexColors: true, transparent: true, alphaTest: 0.1 }) + cameraObjectOverride?: THREE.Object3D // for xr + material = new CustomBlockMaterial() + animatedMaterial = new AnimatedBlockMaterial() itemsTexture: THREE.Texture - cursorBlock: CursorBlock + cursorBlock = new CursorBlock(this) onRender: Array<() => void> = [] cameraShake: CameraShake - cameraContainer: THREE.Object3D media: ThreeJsMedia waitingChunksToDisplay = {} as { [chunkKey: string]: SectionKey[] } - waypoints: WaypointsRenderer camera: THREE.PerspectiveCamera renderTimeAvg = 0 sectionsOffsetsAnimations = {} as { @@ -72,11 +110,6 @@ export class WorldRendererThree extends WorldRendererCommon { } } fountains: Fountain[] = [] - DEBUG_RAYCAST = false - skyboxRenderer: SkyboxRenderer - - private currentPosTween?: tweenJs.Tween - private currentRotTween?: tweenJs.Tween<{ pitch: number, yaw: number }> get tilesRendered () { return Object.values(this.sectionObjects).reduce((acc, obj) => acc + (obj as any).tilesCount, 0) @@ -90,26 +123,19 @@ 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) - this.cursorBlock = new CursorBlock(this) + this.starField = new StarField(this.scene) this.holdingBlock = new HoldingBlock(this) this.holdingBlockLeft = new HoldingBlock(this, true) - // Initialize skybox renderer - this.skyboxRenderer = new SkyboxRenderer(this.scene, this.worldRendererConfig.defaultSkybox, null) - void this.skyboxRenderer.init() - this.addDebugOverlay() this.resetScene() void this.init() + void initVR(this) this.soundSystem = new ThreeJsSound(this) - this.cameraShake = new CameraShake(this, this.onRender) + this.cameraShake = new CameraShake(this.camera, 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), // }) @@ -120,18 +146,12 @@ export class WorldRendererThree extends WorldRendererCommon { this.worldSwitchActions() } - get cameraObject () { - return this.cameraGroupVr ?? this.cameraContainer - } - worldSwitchActions () { this.onWorldSwitched.push(() => { // clear custom blocks this.protocolCustomBlocks.clear() // Reset section animations this.sectionsOffsetsAnimations = {} - // Clear waypoints - this.waypoints.clear() }) } @@ -152,10 +172,6 @@ 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) @@ -166,73 +182,53 @@ 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 () { super.watchReactivePlayerState() - this.onReactivePlayerStateUpdated('inWater', (value) => { - this.skyboxRenderer.updateWaterState(value, this.playerStateReactive.waterBreathing) + this.onReactiveValueUpdated('inWater', (value) => { + this.scene.fog = value ? new THREE.Fog(0x00_00_ff, 0.1, this.displayOptions.playerState.reactive.waterBreathing ? 100 : 20) : null }) - this.onReactivePlayerStateUpdated('waterBreathing', (value) => { - this.skyboxRenderer.updateWaterState(this.playerStateReactive.inWater, value) - }) - this.onReactivePlayerStateUpdated('ambientLight', (value) => { + this.onReactiveValueUpdated('ambientLight', (value) => { if (!value) return this.ambientLight.intensity = value }) - this.onReactivePlayerStateUpdated('directionalLight', (value) => { + this.onReactiveValueUpdated('directionalLight', (value) => { if (!value) return this.directionalLight.intensity = value }) - this.onReactivePlayerStateUpdated('lookingAtBlock', (value) => { + this.onReactiveValueUpdated('lookingAtBlock', (value) => { this.cursorBlock.setHighlightCursorBlock(value ? new Vec3(value.x, value.y, value.z) : null, value?.shapes) }) - this.onReactivePlayerStateUpdated('diggingBlock', (value) => { + this.onReactiveValueUpdated('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 () { - super.watchReactiveConfig() - this.onReactiveConfigUpdated('showChunkBorders', (value) => { - this.updateShowChunksBorder(value) - }) - this.onReactiveConfigUpdated('defaultSkybox', (value) => { - this.skyboxRenderer.updateDefaultSkybox(value) - }) } changeHandSwingingState (isAnimationPlaying: boolean, isLeft = false) { const holdingBlock = isLeft ? this.holdingBlockLeft : this.holdingBlock if (isAnimationPlaying) { - holdingBlock.startSwing() + holdingBlock?.startSwing() } else { - holdingBlock.stopSwing() + holdingBlock?.stopSwing() } } async updateAssetsData (): Promise { - const resources = this.resourcesManager.currentResources + const resources = this.resourcesManager.currentResources! - const oldTexture = this.material.map + const oldTexture = this.material.uniforms.map.value const oldItemsTexture = this.itemsTexture - const texture = loadThreeJsTextureFromBitmap(resources.blocksAtlasImage) - texture.needsUpdate = true + 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 + this.material.uniforms.map.value = texture - const itemsTexture = loadThreeJsTextureFromBitmap(resources.itemsAtlasImage) - itemsTexture.needsUpdate = true + const itemsTexture = await new THREE.TextureLoader().loadAsync(resources.itemsAtlasParser.latestImage) + itemsTexture.magFilter = THREE.NearestFilter + itemsTexture.minFilter = THREE.NearestFilter itemsTexture.flipY = false this.itemsTexture = itemsTexture @@ -252,10 +248,14 @@ export class WorldRendererThree extends WorldRendererCommon { } onAllTexturesLoaded () { - this.holdingBlock.ready = true - this.holdingBlock.updateItem() - this.holdingBlockLeft.ready = true - this.holdingBlockLeft.updateItem() + if (this.holdingBlock) { + this.holdingBlock.ready = true + this.holdingBlock.updateItem() + } + if (this.holdingBlockLeft) { + this.holdingBlockLeft.ready = true + this.holdingBlockLeft.updateItem() + } } changeBackgroundColor (color: [number, number, number]): void { @@ -271,30 +271,17 @@ 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, specificProps: ItemSpecificContextProperties) { - return getItemUv(item, specificProps, this.resourcesManager, this.playerStateReactive) + return getItemUv(item, specificProps, this.resourcesManager) } async demoModel () { //@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) @@ -349,11 +336,10 @@ export class WorldRendererThree extends WorldRendererCommon { section.renderOrder = 500 - chunkDistance } - override updateViewerPosition (pos: Vec3): void { - this.viewerChunkPosition = pos - } - - cameraSectionPositionUpdate () { + updateViewerPosition (pos: Vec3): void { + this.viewerPosition = pos + const cameraPos = this.camera.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) { const value = this.sectionObjects[key] @@ -457,7 +443,7 @@ export class WorldRendererThree extends WorldRendererCommon { this.scene.add(object) } - getSignTexture (position: Vec3, blockEntity, isHanging, backSide = false) { + getSignTexture (position: Vec3, blockEntity, backSide = false) { const chunk = chunkPos(position) let textures = this.chunkTextures.get(`${chunk[0]},${chunk[1]}`) if (!textures) { @@ -469,7 +455,7 @@ export class WorldRendererThree extends WorldRendererCommon { if (textures[texturekey]) return textures[texturekey] const PrismarineChat = PrismarineChatLoader(this.version) - const canvas = renderSign(blockEntity, isHanging, PrismarineChat) + const canvas = renderSign(blockEntity, PrismarineChat) if (!canvas) return const tex = new THREE.Texture(canvas) tex.magFilter = THREE.NearestFilter @@ -479,149 +465,15 @@ export class WorldRendererThree extends WorldRendererCommon { return tex } - getCameraPosition () { - const worldPos = new THREE.Vector3() - this.camera.getWorldPosition(worldPos) - return worldPos - } - - getSectionCameraPosition () { - 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.getSectionCameraPosition() - if (!this.cameraSectionPos.equals(newSectionPos)) { - this.cameraSectionPos = newSectionPos - this.cameraSectionPositionUpdate() - } - } - setFirstPersonCamera (pos: Vec3 | null, yaw: number, pitch: number) { - const yOffset = this.playerStateReactive.eyeHeight + 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() - this.updateCameraSectionPos() } - 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 @@ -630,139 +482,34 @@ export class WorldRendererThree extends WorldRendererCommon { // } if (pos) { - if (this.renderer.xr.isPresenting) { - pos.y -= this.camera.position.y // Fix Y position of camera in world - } - - 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() + new tweenJs.Tween(this.camera.position).to({ x: pos.x, y: pos.y, z: pos.z }, 50).start() // this.freeFlyState.position = pos } - - 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) - - 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 - } - } - } - - this.updateCameraSectionPos() - } - - 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 - } - } + this.cameraShake.setBaseRotation(pitch, yaw) } render (sizeChanged = false) { - if (this.reactiveDebugParams.stopRendering) return - this.debugChunksVisibilityOverride() const start = performance.now() this.lastRendered = performance.now() this.cursorBlock.render() this.updateSectionOffsets() - // Update skybox position to follow camera - const cameraPos = this.getCameraPosition() - this.skyboxRenderer.update(cameraPos, this.viewDistance) - const sizeOrFovChanged = sizeChanged || this.displayOptions.inWorldRenderingConfig.fov !== this.camera.fov if (sizeOrFovChanged) { - const size = this.renderer.getSize(new THREE.Vector2()) - this.camera.aspect = size.width / size.height + this.camera.aspect = window.innerWidth / window.innerHeight this.camera.fov = this.displayOptions.inWorldRenderingConfig.fov this.camera.updateProjectionMatrix() } - if (!this.reactiveDebugParams.disableEntities) { - this.entities.render() - } + 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 + 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.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) + 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 fountain of this.fountains) { @@ -773,8 +520,6 @@ export class WorldRendererThree extends WorldRendererCommon { fountain.render() } - this.waypoints.render() - for (const onRender of this.onRender) { onRender() } @@ -787,22 +532,12 @@ 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 - } else { - textureData = blockEntity.profile?.properties?.find(p => p.name === 'textures')?.value - } - if (!textureData) return + const textures = blockEntity.SkullOwner?.Properties?.textures[0] + if (!textures) return try { - 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) - .replace('https://textures.minecraft.net/', skinTexturesProxy) - } + 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() @@ -826,7 +561,7 @@ export class WorldRendererThree extends WorldRendererCommon { } renderSign (position: Vec3, rotation: number, isWall: boolean, isHanging: boolean, blockEntity) { - const tex = this.getSignTexture(position, blockEntity, isHanging) + const tex = this.getSignTexture(position, blockEntity) if (!tex) return @@ -882,6 +617,7 @@ 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') { @@ -897,16 +633,6 @@ 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) { @@ -982,19 +708,6 @@ export class WorldRendererThree extends WorldRendererCommon { destroy (): void { super.destroy() - this.skyboxRenderer.dispose() - } - - 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 () { @@ -1043,10 +756,6 @@ export class WorldRendererThree extends WorldRendererCommon { } } } - - reloadWorld () { - this.entities.reloadEntities() - } } class StarField { @@ -1063,16 +772,7 @@ 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 - }) + constructor (private readonly scene: THREE.Scene) { } addToScene () { @@ -1083,6 +783,7 @@ class StarField { const count = 7000 const factor = 7 const saturation = 10 + const speed = 0.2 const geometry = new THREE.BufferGeometry() @@ -1113,8 +814,13 @@ class StarField { // Create points and add them to the scene this.points = new THREE.Points(geometry, material) - this.worldRenderer.scene.add(this.points) + this.scene.add(this.points) + const clock = new THREE.Clock() + this.points.onBeforeRender = (renderer, scene, camera) => { + this.points?.position.copy?.(camera.position) + material.uniforms.time.value = clock.getElapsedTime() * speed + } this.points.renderOrder = -1 } @@ -1122,7 +828,7 @@ class StarField { if (this.points) { this.points.geometry.dispose(); (this.points.material as THREE.Material).dispose() - this.worldRenderer.scene.remove(this.points) + this.scene.remove(this.points) this.points = undefined } diff --git a/rsbuild.config.ts b/rsbuild.config.ts index 6cd6b2ed..5e76646e 100644 --- a/rsbuild.config.ts +++ b/rsbuild.config.ts @@ -1,4 +1,3 @@ -/// import { defineConfig, mergeRsbuildConfig, RsbuildPluginAPI } from '@rsbuild/core' import { pluginReact } from '@rsbuild/plugin-react' import { pluginTypedCSSModules } from '@rsbuild/plugin-typed-css-modules' @@ -15,7 +14,6 @@ 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' @@ -50,7 +48,7 @@ if (fs.existsSync('./assets/release.json')) { const configJson = JSON.parse(fs.readFileSync('./config.json', 'utf8')) try { - Object.assign(configJson, JSON.parse(fs.readFileSync(process.env.LOCAL_CONFIG_FILE || './config.local.json', 'utf8'))) + Object.assign(configJson, JSON.parse(fs.readFileSync('./config.local.json', 'utf8'))) } catch (err) {} if (dev) { configJson.defaultProxy = ':8080' @@ -60,8 +58,6 @@ 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: { @@ -115,22 +111,6 @@ 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, @@ -139,13 +119,6 @@ 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', @@ -161,15 +134,12 @@ 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.ALWAYS_MINIMAL_SERVER_UI': JSON.stringify(process.env.ALWAYS_MINIMAL_SERVER_UI), + '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(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: { @@ -197,21 +167,20 @@ 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 || process.env.ALWAYS_COMPRESS_LARGE_DATA === 'true') + 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') 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') } if (configSource === 'REMOTE') { - fs.writeFileSync('./dist/config.json', JSON.stringify(configJson, undefined, 2), 'utf8') + fs.writeFileSync('./dist/config.json', JSON.stringify(configJson), 'utf8') } if (fs.existsSync('./generated/sounds.js')) { fs.copyFileSync('./generated/sounds.js', './dist/sounds.js') @@ -227,12 +196,6 @@ 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) { @@ -240,10 +203,6 @@ 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/genLargeDataAliases.ts b/scripts/genLargeDataAliases.ts index 2372dbfd..0cf206df 100644 --- a/scripts/genLargeDataAliases.ts +++ b/scripts/genLargeDataAliases.ts @@ -16,8 +16,7 @@ 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)) { - const chunkName = module === 'mcData' ? 'mc-data' : 'mc-assets'; - let importCode = `(await import(/* webpackChunkName: "${chunkName}" */ '${isCompressed ? compressed : raw}')).default`; + let importCode = `(await import('${isCompressed ? compressed : raw}')).default`; if (isCompressed) { importCode = `JSON.parse(decompressFromBase64(${importCode}))` } @@ -31,8 +30,6 @@ 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/githubActions.mjs b/scripts/githubActions.mjs index 3e8eb0f6..ab786ea9 100644 --- a/scripts/githubActions.mjs +++ b/scripts/githubActions.mjs @@ -15,17 +15,6 @@ 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') { - setOutput('alias', final(`v${patch}`)) - } else { - setOutput('alias', final(tag)) - } } } diff --git a/scripts/makeOptimizedMcData.mjs b/scripts/makeOptimizedMcData.mjs index a572d067..05948cf2 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}` } -let versions = {} +const versions = {} const dataTypes = new Set() for (const [version, dataSet] of Object.entries(dataPaths.pc)) { @@ -42,31 +42,6 @@ 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 @@ -82,27 +57,22 @@ const dataTypeBundling2 = { } } const dataTypeBundling = { - language: process.env.SKIP_MC_DATA_LANGUAGE === 'true' ? { - raw: {} - } : { + language: { ignoreRemoved: true, ignoreChanges: true }, blocks: { arrKey: 'name', - processData(current, prev, _, version) { + processData (current, prev) { 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, @@ -166,9 +136,7 @@ const dataTypeBundling = { blockLoot: { arrKey: 'block' }, - recipes: process.env.SKIP_MC_DATA_RECIPES === 'true' ? { - raw: {} - } : { + recipes: { raw: true // processData: processRecipes }, @@ -182,7 +150,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') @@ -274,39 +242,30 @@ for (const [i, [version, dataSet]] of versionsArr.reverse().entries()) { for (const [dataType, dataPath] of Object.entries(dataSet)) { const config = dataTypeBundling[dataType] if (!config) continue - const ignoreCollisionShapes = dataType === 'blockCollisionShapes' && versionToNumber(version) >= versionToNumber('1.13') - + if (dataType === 'blockCollisionShapes' && versionToNumber(version) >= versionToNumber('1.13')) { + // contents += ` get ${dataType} () { return window.globalGetCollisionShapes?.("${version}") },\n` + continue + } let injectCode = '' - const getRealData = (type) => { + 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 = getRealData(dataType) + const dataRaw = getData(dataType) let rawData = dataRaw if (config.raw) { rawDataVersions[dataType] ??= {} rawDataVersions[dataType][version] = rawData - if (config.raw === true) { - rawData = dataRaw - } else { - rawData = config.raw - } - - if (ignoreCollisionShapes && dataType === 'blockCollisionShapes') { - rawData = { - blocks: {}, - shapes: {} - } - } + rawData = dataRaw } else { if (!diffSources[dataType]) { diffSources[dataType] = new JsonOptimizer(config.arrKey, config.ignoreChanges, config.ignoreRemoved) } try { - config.processData?.(dataRaw, previousData[dataType], getRealData, version) + config.processData?.(dataRaw, previousData[dataType], getData, version) diffSources[dataType].recordDiff(version, dataRaw) injectCode = `restoreDiff(sources, ${JSON.stringify(dataType)}, ${JSON.stringify(version)})` } catch (err) { @@ -338,16 +297,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' @@ -371,7 +330,6 @@ 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, diff --git a/scripts/patchAssets.ts b/scripts/patchAssets.ts deleted file mode 100644 index 99994f5f..00000000 --- a/scripts/patchAssets.ts +++ /dev/null @@ -1,137 +0,0 @@ -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/scripts/requestData.ts b/scripts/requestData.ts deleted file mode 100644 index dc866a1b..00000000 --- a/scripts/requestData.ts +++ /dev/null @@ -1,42 +0,0 @@ -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/updateGitDeps.ts b/scripts/updateGitDeps.ts deleted file mode 100644 index 797aea8f..00000000 --- a/scripts/updateGitDeps.ts +++ /dev/null @@ -1,160 +0,0 @@ -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 - devDependencies?: Record - } - } -} - -interface PackageJson { - pnpm?: { - updateConfig?: { - ignoreDependencies?: string[] - } - } -} - -async function prompt(question: string): Promise { - 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 { - 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 - }> = [] - - 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) diff --git a/scripts/wsServer.ts b/scripts/wsServer.ts deleted file mode 100644 index 43035f52..00000000 --- a/scripts/wsServer.ts +++ /dev/null @@ -1,45 +0,0 @@ -import {WebSocketServer} from 'ws' - -export function startWsServer(port: number = 8081, tryOtherPort: boolean = true): Promise { - 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/server.js b/server.js index 49699cdb..20e66051 100644 --- a/server.js +++ b/server.js @@ -16,23 +16,9 @@ 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: '*', - log: process.argv.includes('--log') || process.env.LOG === 'true', - timeout -})) +app.use(netApi({ allowOrigin: '*' })) if (!isProd) { app.use('/sounds', express.static(path.join(__dirname, './generated/sounds/'))) } diff --git a/src/appConfig.ts b/src/appConfig.ts index c29d74e8..156c5974 100644 --- a/src/appConfig.ts +++ b/src/appConfig.ts @@ -5,28 +5,6 @@ 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 - readonly iconStyle?: React.CSSProperties -} - export type AppConfig = { // defaultHost?: string // defaultHostSave?: string @@ -35,7 +13,7 @@ export type AppConfig = { // defaultVersion?: string peerJsServer?: string peerJsServerFallback?: string - promoteServers?: Array<{ ip, description, name?, version?, }> + promoteServers?: Array<{ ip, description, version? }> mapsProvider?: string appParams?: Record // query string params @@ -46,23 +24,15 @@ export type AppConfig = { // hideSettings?: Record allowAutoConnect?: boolean splashText?: string - splashTextFallback?: string pauseLinks?: Array>> - mobileButtons?: MobileButtonConfig[] keybindings?: Record defaultLanguage?: string displayLanguageSelector?: boolean supportedLanguages?: string[] showModsButton?: boolean - defaultUsername?: string - 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 { @@ -74,7 +44,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 in appConfig.defaultSettings && !qsOptions[key]) { + if (appConfig.defaultSettings?.[key] && !qsOptions[key]) { options[key] = appConfig.defaultSettings[key] } } else { @@ -82,16 +52,13 @@ 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)) updateBinds(customKeymaps) } - appViewer?.appConfigUdpate() - - setStorageDataOnAppConfigLoad(appConfig) + setStorageDataOnAppConfigLoad() } export const isBundledConfigUsed = !!process.env.INLINED_APP_CONFIG diff --git a/src/appParams.ts b/src/appParams.ts index 4c8ca186..aec6fd0b 100644 --- a/src/appParams.ts +++ b/src/appParams.ts @@ -12,7 +12,6 @@ export type AppQsParams = { username?: string lockConnect?: string autoConnect?: string - alwaysReconnect?: string // googledrive.ts params state?: string // ServersListProvider.tsx params @@ -46,8 +45,6 @@ export type AppQsParams = { onlyConnect?: string connectText?: string freezeSettings?: string - testIosCrash?: string - addPing?: string // Replay params replayFilter?: string diff --git a/src/appStatus.ts b/src/appStatus.ts index 101714f5..d3bfc461 100644 --- a/src/appStatus.ts +++ b/src/appStatus.ts @@ -1,10 +1,8 @@ -import { resetStateAfterDisconnect } from './browserfs' 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) { - 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 @@ -26,6 +24,7 @@ export const setLoadingScreenStatus = function (status: string | undefined | nul } showModal({ reactType: 'app-status' }) if (appStatusState.isError) { + miscUiState.gameLoaded = false return } appStatusState.hideDots = hideDots @@ -33,9 +32,5 @@ 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 diff --git a/src/appViewer.ts b/src/appViewer.ts index 628d11b4..ca62bd1b 100644 --- a/src/appViewer.ts +++ b/src/appViewer.ts @@ -1,30 +1,24 @@ -import { WorldDataEmitter, WorldDataEmitterWorker } from 'renderer/viewer/lib/worldDataEmitter' -import { getInitialPlayerState, PlayerStateRenderer, PlayerStateReactive } from 'renderer/viewer/lib/basePlayerState' +import { WorldDataEmitter } from 'renderer/viewer/lib/worldDataEmitter' +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, subscribe } from 'valtio' +import { proxy } 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' import { activeModalStack, miscUiState } from './globalState' import { options } from './optionsStorage' -import { ResourcesManager, ResourcesManagerTransferred } from './resourcesManager' +import { ResourcesManager } from './resourcesManager' import { watchOptionsAfterWorldViewInit } from './watchOptions' -import { loadMinecraftData } from './connect' -import { reloadChunks } from './utils' -import { displayClientChat } from './botUtils' export interface RendererReactiveState { world: { - chunksLoaded: Set - // chunksTotalNumber: number - heightmaps: Map + chunksLoaded: string[] + chunksTotalNumber: number allChunksLoaded: boolean mesherWork: boolean intersectMedia: { id: string, x: number, y: number } | null @@ -34,8 +28,11 @@ export interface RendererReactiveState { } export interface NonReactiveState { world: { - chunksLoaded: Set + chunksLoaded: string[] chunksTotalNumber: number + allChunksLoaded: boolean + mesherWork: boolean + intersectMedia: { id: string, x: number, y: number } | null } } @@ -44,39 +41,33 @@ export interface GraphicsBackendConfig { powerPreference?: 'high-performance' | 'low-power' statsVisible?: number sceneBackground: string - timeoutRendering?: boolean } const defaultGraphicsBackendConfig: GraphicsBackendConfig = { fpsLimit: undefined, powerPreference: undefined, - sceneBackground: 'lightblue', - timeoutRendering: false + sceneBackground: 'lightblue' } export interface GraphicsInitOptions { - resourcesManager: ResourcesManagerTransferred + resourcesManager: ResourcesManager config: GraphicsBackendConfig rendererSpecificSettings: S - callbacks: { - displayCriticalError: (error: Error) => void - setRendererSpecificSettings: (key: string, value: any) => void - - fireCustomEvent: (eventName: string, ...args: any[]) => void - } + displayCriticalError: (error: Error) => void + setRendererSpecificSettings: (key: string, value: any) => void } export interface DisplayWorldOptions { version: string - worldView: WorldDataEmitterWorker + worldView: WorldDataEmitter inWorldRenderingConfig: WorldRendererConfig - playerStateReactive: PlayerStateReactive + playerState: IPlayerState rendererState: RendererReactiveState nonReactiveState: NonReactiveState } -export type GraphicsBackendLoader = ((options: GraphicsInitOptions) => MaybePromise) & { +export type GraphicsBackendLoader = ((options: GraphicsInitOptions) => GraphicsBackend) & { id: string } @@ -116,8 +107,8 @@ export class AppViewer { inWorldRenderingConfig: WorldRendererConfig = proxy(defaultWorldRendererConfig) lastCamUpdate = 0 playerState = playerState - rendererState = getDefaultRendererState().reactive - nonReactiveState: NonReactiveState = getDefaultRendererState().nonReactive + rendererState = proxy(getDefaultRendererState()) + nonReactiveState: NonReactiveState = getDefaultRendererState() worldReady: Promise private resolveWorldReady: () => void @@ -141,24 +132,19 @@ export class AppViewer { rendererSpecificSettings[key.slice(rendererSettingsKey.length + 1)] = options[key] } } - const loaderOptions: GraphicsInitOptions = { // todo! - resourcesManager: this.resourcesManager as ResourcesManagerTransferred, + const loaderOptions: GraphicsInitOptions = { + resourcesManager: this.resourcesManager, config: this.config, - 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) - } + displayCriticalError (error) { + console.error(error) + setLoadingScreenStatus(error.message, true) }, rendererSpecificSettings, + setRendererSpecificSettings (key: string, value: any) { + options[`${rendererSettingsKey}.${key}`] = value + } } - this.backend = await loader(loaderOptions) + this.backend = loader(loaderOptions) // if (this.resourcesManager.currentResources) { // void this.prepareResources(this.resourcesManager.currentResources.version, createNotificationProgressReporter()) @@ -166,20 +152,12 @@ export class AppViewer { // Execute queued action if exists if (this.currentState) { - 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()) - } + const { method, args } = this.currentState + this.backend[method](...args) + if (method === 'startWorld') { + // void this.worldView!.init(args[0].playerState.getPosition()) } } - - // todo - modalStackUpdateChecks() } async startWithBot () { @@ -188,33 +166,19 @@ 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) { + async startWorld (world, renderDistance: number, playerStateSend: IPlayerState = this.playerState) { if (this.currentDisplay === 'world') throw new Error('World already started') this.currentDisplay = 'world' - const startPosition = bot.entity?.position ?? new Vec3(0, 64, 0) + const startPosition = playerStateSend.getPosition() this.worldView = new WorldDataEmitter(world, renderDistance, startPosition) - this.worldView.panicChunksReload = () => { - if (!options.experimentalClientSelfReload) return - 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 watchOptionsAfterWorldViewInit(this.worldView) - this.appConfigUdpate() const displayWorldOptions: DisplayWorldOptions = { version: this.resourcesManager.currentConfig!.version, worldView: this.worldView, inWorldRenderingConfig: this.inWorldRenderingConfig, - playerStateReactive: playerStateSend, + playerState: playerStateSend, rendererState: this.rendererState, nonReactiveState: this.nonReactiveState } @@ -234,22 +198,16 @@ export class AppViewer { resetBackend (cleanState = false) { this.disconnectBackend(cleanState) if (this.backendLoader) { - void this.loadBackend(this.backendLoader) + this.loadBackend(this.backendLoader) } } startPanorama () { if (this.currentDisplay === 'menu') return + this.currentDisplay = 'menu' if (options.disableAssets) return - 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() - } + if (this.backend) { + this.backend.startPanorama() } this.currentState = { method: 'startPanorama', args: [] } } @@ -279,8 +237,7 @@ export class AppViewer { const { promise, resolve } = Promise.withResolvers() this.worldReady = promise this.resolveWorldReady = resolve - this.rendererState = proxy(getDefaultRendererState().reactive) - this.nonReactiveState = getDefaultRendererState().nonReactive + this.rendererState = proxy(getDefaultRendererState()) // this.queuedDisplay = undefined } @@ -301,7 +258,6 @@ export class AppViewer { } } -// do not import this. Use global appViewer instead (without window prefix). export const appViewer = new AppViewer() window.appViewer = appViewer @@ -309,46 +265,34 @@ const initialMenuStart = async () => { if (appViewer.currentDisplay === 'world') { appViewer.resetBackend(true) } - const demo = new URLSearchParams(window.location.search).get('demo') - if (!demo) { - appViewer.startPanorama() - return - } + appViewer.startPanorama() // const version = '1.18.2' - 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)) + // 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)) } window.initialMenuStart = initialMenuStart -const hasAppStatus = () => activeModalStack.some(m => m.reactType === 'app-status') - const modalStackUpdateChecks = () => { // maybe start panorama - if (!miscUiState.gameLoaded && !hasAppStatus()) { + if (activeModalStack.length === 0 && !miscUiState.gameLoaded) { void initialMenuStart() } if (appViewer.backend) { - appViewer.backend.setRendering(!hasAppStatus()) + const hasAppStatus = activeModalStack.some(m => m.reactType === 'app-status') + appViewer.backend.setRendering(!hasAppStatus) } appViewer.inWorldRenderingConfig.foreground = activeModalStack.length === 0 } -subscribe(activeModalStack, modalStackUpdateChecks) +subscribeKey(activeModalStack, 'length', modalStackUpdateChecks) +modalStackUpdateChecks() diff --git a/src/basicSounds.ts b/src/basicSounds.ts index 54af0d35..40428c6b 100644 --- a/src/basicSounds.ts +++ b/src/basicSounds.ts @@ -7,12 +7,7 @@ let audioContext: AudioContext const sounds: Record = {} // Track currently playing sounds and their gain nodes -const activeSounds: Array<{ - source: AudioBufferSourceNode; - gainNode: GainNode; - volumeMultiplier: number; - isMusic: boolean; -}> = [] +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 @@ -48,7 +43,7 @@ export async function loadSound (path: string, contents = path) { } } -export const loadOrPlaySound = async (url, soundVolume = 1, loadTimeout = options.remoteSoundsLoadTimeout, loop = false, isMusic = false) => { +export const loadOrPlaySound = async (url, soundVolume = 1, loadTimeout = 500) => { const soundBuffer = sounds[url] if (!soundBuffer) { const start = Date.now() @@ -56,11 +51,11 @@ export const loadOrPlaySound = async (url, soundVolume = 1, loadTimeout = option if (cancelled || Date.now() - start > loadTimeout) return } - return playSound(url, soundVolume, loop, isMusic) + return playSound(url, soundVolume) } -export async function playSound (url, soundVolume = 1, loop = false, isMusic = false) { - const volume = soundVolume * (options.volume / 100) * (isMusic ? options.musicVolume / 100 : 1) +export async function playSound (url, soundVolume = 1) { + const volume = soundVolume * (options.volume / 100) if (!volume) return @@ -80,14 +75,13 @@ export async function playSound (url, soundVolume = 1, loop = false, isMusic = f 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 source.start(0) // Add to active sounds - activeSounds.push({ source, gainNode, volumeMultiplier: soundVolume, isMusic }) + activeSounds.push({ source, gainNode, volumeMultiplier: soundVolume }) const callbacks = [] as Array<() => void> source.onended = () => { @@ -105,17 +99,6 @@ export async function playSound (url, soundVolume = 1, loop = false, isMusic = f 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) - } - }, - gainNode, } } @@ -130,24 +113,11 @@ 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, newMusicVolume: number) { +export function changeVolumeOfCurrentlyPlayingSounds (newVolume: number) { const normalizedVolume = newVolume / 100 - for (const { gainNode, volumeMultiplier, isMusic } of activeSounds) { + for (const { gainNode, volumeMultiplier } of activeSounds) { try { - gainNode.gain.value = normalizedVolume * volumeMultiplier * (isMusic ? newMusicVolume / 100 : 1) + gainNode.gain.value = normalizedVolume * volumeMultiplier } catch (err) { console.warn('Failed to change sound volume:', err) } @@ -155,9 +125,5 @@ export function changeVolumeOfCurrentlyPlayingSounds (newVolume: number, newMusi } subscribeKey(options, 'volume', () => { - changeVolumeOfCurrentlyPlayingSounds(options.volume, options.musicVolume) -}) - -subscribeKey(options, 'musicVolume', () => { - changeVolumeOfCurrentlyPlayingSounds(options.volume, options.musicVolume) + changeVolumeOfCurrentlyPlayingSounds(options.volume) }) diff --git a/src/browserfs.ts b/src/browserfs.ts index 006b6db8..a4ae96cc 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, removeDirectoryItself = true) { +export async function removeFileRecursiveAsync (path) { const errors = [] as Array<[string, Error]> try { const files = await fs.promises.readdir(path) @@ -282,9 +282,7 @@ export async function removeFileRecursiveAsync (path, removeDirectoryItself = tr })) // After removing all files/directories, remove the current directory - if (removeDirectoryItself) { - await fs.promises.rmdir(path) - } + await fs.promises.rmdir(path) } catch (error) { errors.push([path, error]) } diff --git a/src/cameraRotationControls.ts b/src/cameraRotationControls.ts index 679a3a44..3368666f 100644 --- a/src/cameraRotationControls.ts +++ b/src/cameraRotationControls.ts @@ -18,7 +18,6 @@ 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 @@ -33,6 +32,7 @@ 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 @@ -74,6 +74,8 @@ 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/chatUtils.test.ts b/src/chatUtils.test.ts index 6d683919..e717da28 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, isAllowedChatCharacter, isStringAllowed } from './chatUtils' +import { formatMessage } from './chatUtils' //@ts-expect-error globalThis.loadedData ??= mcData('1.20.1') @@ -64,21 +64,3 @@ test('formatMessage', () => { ] `) }) - -test('isAllowedChatCharacter', () => { - expect(isAllowedChatCharacter('a')).toBe(true) - expect(isAllowedChatCharacter('a')).toBe(true) - expect(isAllowedChatCharacter('§')).toBe(false) - expect(isAllowedChatCharacter(' ')).toBe(true) - expect(isStringAllowed('a§b')).toMatchObject({ - valid: false, - clean: 'ab', - invalid: ['§'] - }) - expect(isStringAllowed('aツ')).toMatchObject({ - valid: true, - }) - expect(isStringAllowed('a🟢')).toMatchObject({ - valid: true, - }) -}) diff --git a/src/chatUtils.ts b/src/chatUtils.ts index 849d5847..ade800ac 100644 --- a/src/chatUtils.ts +++ b/src/chatUtils.ts @@ -4,10 +4,6 @@ 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 & { text: string color?: string @@ -118,14 +114,6 @@ 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', @@ -137,37 +125,3 @@ 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() - 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, - clean: [...str].filter(c => !invalidChars.has(c)).join(''), - invalid: [...invalidChars] - } -} diff --git a/src/clientMods.ts b/src/clientMods.ts index 204a5861..a6242d1a 100644 --- a/src/clientMods.ts +++ b/src/clientMods.ts @@ -9,7 +9,6 @@ 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 = () => { @@ -91,29 +90,6 @@ 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[] @@ -151,9 +127,6 @@ export interface ClientMod { lastUpdated?: number wasModifiedLocally?: boolean // todo depends, hashsum - - settings?: ModSettingsDict - actionsMain?: Record } const cleanupFetchedModData = (mod: ClientModDefinition | Record) => { @@ -184,7 +157,7 @@ async function getPlugin (name: string) { return db.get('mods', name) as Promise } -export async function getAllMods () { +async function getAllMods () { const db = await dbPromise return db.getAll('mods') as Promise } @@ -262,7 +235,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), { settings: getModSettingsProxy(mod) }) + module.default?.(structuredClone(mod)) window.loadedMods[mod.name] ??= {} window.loadedMods[mod.name].mainUnstableModule = module } catch (e) { @@ -607,31 +580,3 @@ 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/connect.ts b/src/connect.ts index cb6b8f65..b68e4325 100644 --- a/src/connect.ts +++ b/src/connect.ts @@ -3,6 +3,7 @@ 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' @@ -20,6 +21,7 @@ export type ConnectOptions = { peerId?: string ignoreQs?: boolean onSuccessfulPlay?: () => void + autoLoginPassword?: string serverIndex?: string authenticatedAccount?: AuthenticatedAccount | true peerOptions?: any @@ -64,6 +66,7 @@ export const loadMinecraftData = async (version: string) => { window.PrismarineItem = PrismarineItem(mcData.version.minecraftVersion!) window.loadedData = mcData window.mcData = mcData + window.pathfinder = pathfinder miscUiState.loadedDataVersion = version } diff --git a/src/controls.ts b/src/controls.ts index db6a6fc6..f8160cfd 100644 --- a/src/controls.ts +++ b/src/controls.ts @@ -27,9 +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' -import { type ActionType, type ActionHoldConfig, type CustomAction } from './appConfig' -import { playerState } from './mineflayer/playerState' + export const customKeymaps = proxy(appStorage.keybindings) subscribe(customKeymaps, () => { @@ -47,7 +45,6 @@ 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'], @@ -57,7 +54,7 @@ export const contro = new ControMax({ attackDestroy: [null, 'Right Trigger'], interactPlace: [null, 'Left Trigger'], swapHands: ['KeyF'], - selectItem: ['KeyH'], + selectItem: ['KeyH'], // default will be removed rotateCameraLeft: [null], rotateCameraRight: [null], rotateCameraUp: [null], @@ -65,13 +62,9 @@ export const contro = new ControMax({ // ui? chat: [['KeyT', 'Enter']], command: ['Slash'], - playersList: ['Tab'], - debugOverlay: ['F3'], - debugOverlayHelpMenu: [null], // client side zoom: ['KeyC'], viewerConsole: ['Backquote'], - togglePerspective: ['F5'], }, ui: { toggleFullscreen: ['F11'], @@ -83,7 +76,7 @@ export const contro = new ControMax({ pauseMenu: [null, 'Start'] }, communication: { - toggleMicrophone: ['KeyM'], + toggleMicrophone: ['KeyK'], }, advanced: { lockUrl: ['KeyY'], @@ -116,10 +109,6 @@ export const contro = new ControMax({ window.controMax = contro export type Command = CommandEventArgument['command'] -export const isCommandDisabled = (command: Command) => { - return miscUiState.appConfig?.disabledCommands?.includes(command) -} - onControInit() updateBinds(customKeymaps) @@ -137,14 +126,7 @@ 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) { @@ -253,10 +235,6 @@ const inModalCommand = (command: Command, pressed: boolean) => { 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 @@ -353,9 +331,6 @@ 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', @@ -377,7 +352,6 @@ window.cameraRotationControls = cameraRotationControls const setSneaking = (state: boolean) => { gameAdditionalState.isSneaking = state bot.setControlState('sneak', state) - } const onTriggerOrReleased = (command: Command, pressed: boolean) => { @@ -388,7 +362,6 @@ 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)) @@ -426,67 +399,12 @@ const onTriggerOrReleased = (command: Command, pressed: boolean) => { case 'general.zoom': gameAdditionalState.isZooming = pressed break - case 'general.debugOverlay': - if (pressed) { - miscUiState.showDebugHud = !miscUiState.showDebugHud - } - break - case 'general.debugOverlayHelpMenu': - if (pressed) { - void onF3LongPress() - } - break case 'general.rotateCameraLeft': case 'general.rotateCameraRight': case 'general.rotateCameraUp': case 'general.rotateCameraDown': cameraRotationControls.handleCommand(command, pressed) break - 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) { - case 'ui.pauseMenu': - if (pressed) { - if (activeModalStack.length) { - hideCurrentModal() - } else { - showModal({ reactType: 'pause-screen' }) - } - } - break - case 'ui.back': - case 'ui.toggleFullscreen': - case 'ui.toggleMap': - case 'ui.leftClick': - case 'ui.rightClick': - case 'ui.speedupCursor': - // These are handled elsewhere - break } } } @@ -503,9 +421,6 @@ const alwaysPressedHandledCommand = (command: Command) => { if (command === 'advanced.lockUrl') { lockUrl() } - if (command === 'communication.toggleMicrophone') { - toggleMicrophoneMuted?.() - } } export function lockUrl () { @@ -548,8 +463,6 @@ const customCommandsHandler = ({ command }) => { contro.on('trigger', customCommandsHandler) contro.on('trigger', ({ command }) => { - if (isCommandDisabled(command)) return - const willContinue = !isGameActive(true) alwaysPressedHandledCommand(command) if (willContinue) return @@ -581,22 +494,13 @@ contro.on('trigger', ({ command }) => { case 'general.rotateCameraRight': case 'general.rotateCameraUp': case 'general.rotateCameraDown': - case 'general.debugOverlay': - case 'general.debugOverlayHelpMenu': - case 'general.playersList': - case 'general.togglePerspective': // no-op break case 'general.swapHands': { - if (isSpectatingEntity()) break - bot._client.write('block_dig', { - 'status': 6, - 'location': { - 'x': 0, - 'z': 0, - 'y': 0 - }, - 'face': 0, + bot._client.write('entity_action', { + entityId: bot.entity.id, + actionId: 6, + jumpBoost: 0 }) break } @@ -604,13 +508,11 @@ contro.on('trigger', ({ command }) => { // handled in onTriggerOrReleased break case 'general.inventory': - if (isSpectatingEntity()) break document.exitPointerLock?.() openPlayerInventory() break case 'general.drop': { - if (isSpectatingEntity()) break - // protocol 1.9+ + // if (bot.heldItem/* && ctrl */) bot.tossStack(bot.heldItem) bot._client.write('block_dig', { 'status': 4, 'location': { @@ -629,12 +531,6 @@ contro.on('trigger', ({ command }) => { } break } - case 'general.dropStack': { - if (bot.heldItem) { - void bot.tossStack(bot.heldItem) - } - break - } case 'general.chat': showModal({ reactType: 'chat' }) break @@ -643,15 +539,12 @@ 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': @@ -664,6 +557,14 @@ contro.on('trigger', ({ command }) => { } } + if (command === 'communication.toggleMicrophone') { + // toggleMicrophoneMuted() + } + + if (command === 'ui.pauseMenu') { + showModal({ reactType: 'pause-screen' }) + } + if (command === 'ui.toggleFullscreen') { void goFullscreen(true) } @@ -683,8 +584,6 @@ contro.on('trigger', ({ command }) => { }) contro.on('release', ({ command }) => { - if (isCommandDisabled(command)) return - inModalCommand(command, false) onTriggerOrReleased(command, false) }) @@ -716,9 +615,6 @@ 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', }, @@ -736,12 +632,6 @@ export const f3Keybinds: Array<{ }, mobileTitle: 'Show Chunks Debug', }, - { - action () { - showModal({ reactType: 'renderer-debug' }) - }, - mobileTitle: 'Renderer Debug Menu', - }, { key: 'KeyY', async action () { @@ -818,23 +708,30 @@ export const f3Keybinds: Array<{ } ] -export const reloadChunksAction = () => { - const action = f3Keybinds.find(f3Keybind => f3Keybind.key === 'KeyA') - void action!.action() -} - +const hardcodedPressedKeys = new Set() document.addEventListener('keydown', (e) => { if (!isGameActive(false)) return - if (contro.pressedKeys.has('F3')) { + if (hardcodedPressedKeys.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 @@ -990,62 +887,3 @@ export function updateBinds (commands: any) { })) } } - -export const onF3LongPress = async () => { - const actions = f3Keybinds.filter(f3Keybind => { - return f3Keybind.mobileTitle && (f3Keybind.enabled?.() ?? true) - }) - const actionNames = actions.map(f3Keybind => { - return `${f3Keybind.mobileTitle}${f3Keybind.key ? ` (F3+${f3Keybind.key})` : ''}` - }) - const select = await showOptionsModal('', actionNames) - if (!select) return - const actionIndex = actionNames.indexOf(select) - const f3Keybind = actions[actionIndex]! - void f3Keybind.action() -} - -export const handleMobileButtonCustomAction = (action: CustomAction) => { - const handler = customCommandsConfig[action.type]?.handler - if (handler) { - handler([...action.input]) - } -} - -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 = { - 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/core/ideChannels.ts b/src/core/ideChannels.ts deleted file mode 100644 index a9c517f7..00000000 --- a/src/core/ideChannels.ts +++ /dev/null @@ -1,106 +0,0 @@ -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/core/importExport.ts b/src/core/importExport.ts deleted file mode 100644 index b3e26347..00000000 --- a/src/core/importExport.ts +++ /dev/null @@ -1,219 +0,0 @@ -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 - keybindings?: Record - 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((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, { 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(([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 - - 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/core/progressReporter.ts b/src/core/progressReporter.ts index 75878fd2..c76bfb0b 100644 --- a/src/core/progressReporter.ts +++ b/src/core/progressReporter.ts @@ -122,7 +122,6 @@ const createProgressReporter = (implementation: ReporterDisplayImplementation): }, setMessage (message: string): void { - if (ended) return implementation.setMessage(message) }, @@ -131,7 +130,6 @@ const createProgressReporter = (implementation: ReporterDisplayImplementation): }, error (message: string): void { - if (ended) return implementation.error(message) } } diff --git a/src/customChannels.ts b/src/customChannels.ts index 506ea776..57c057d5 100644 --- a/src/customChannels.ts +++ b/src/customChannels.ts @@ -2,20 +2,19 @@ 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 () => { if (!options.customChannels) return - bot.once('login', () => { - registerBlockModelsChannel() - registerMediaChannels() - registerSectionAnimationChannels() - registeredJeiChannel() - registerBlockInteractionsCustomizationChannel() - registerWaypointChannels() - registerIdeChannels() + await new Promise(resolve => { + bot.once('login', () => { + resolve(true) + }) }) + registerBlockModelsChannel() + registerMediaChannels() + registerSectionAnimationChannels() + registeredJeiChannel() }) } @@ -33,95 +32,6 @@ 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) - bot.mouse.setConfigFromPacket(config) - }, 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' - }, - { - 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, - metadata - }) - }) - - 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' diff --git a/src/customClient.js b/src/customClient.js index b1a99904..b6c85fcc 100644 --- a/src/customClient.js +++ b/src/customClient.js @@ -1,7 +1,6 @@ -//@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') @@ -52,20 +51,8 @@ class CustomChannelClient extends EventEmitter { this.emit('state', newProperty, oldProperty) } - 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 + end(reason) { + this._endReason = reason this.emit('end', this._endReason) // still emits on server side only, doesn't send anything to our client } diff --git a/src/dayCycle.ts b/src/dayCycle.ts new file mode 100644 index 00000000..50e63a21 --- /dev/null +++ b/src/dayCycle.ts @@ -0,0 +1,46 @@ +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/defaultOptions.ts b/src/defaultOptions.ts deleted file mode 100644 index 48c1cfad..00000000 --- a/src/defaultOptions.ts +++ /dev/null @@ -1,159 +0,0 @@ -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: true, - musicVolume: 50, - // fov: 70, - fov: 75, - defaultPerspective: 'first_person' as 'first_person' | 'third_person_back' | 'third_person_front', - 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, - defaultSkybox: 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: [] as string[], - preventDevReloadWhilePlaying: false, - numWorkers: 4, - localServerOptions: { - gameMode: 1 - } as any, - saveLoginPassword: 'prompt' as 'prompt' | 'never' | 'always', - preferLoadReadonly: false, - experimentalClientSelfReload: false, - remoteSoundsSupport: false, - remoteSoundsLoadTimeout: 500, - 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 -} - -function getTouchControlsSize () { - return { - joystick: 55, - action: 36, - break: 36, - jump: 36, - sneak: 36, - } -} diff --git a/src/devtools.ts b/src/devtools.ts index 1f8ef8e8..b9267127 100644 --- a/src/devtools.ts +++ b/src/devtools.ts @@ -5,17 +5,6 @@ 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) @@ -220,105 +209,3 @@ 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_PORT - 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) { - 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/downloadAndOpenFile.ts b/src/downloadAndOpenFile.ts index 1ff318ff..1e703369 100644 --- a/src/downloadAndOpenFile.ts +++ b/src/downloadAndOpenFile.ts @@ -11,12 +11,6 @@ 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/dragndrop.ts b/src/dragndrop.ts index 5a16bc05..6be90551 100644 --- a/src/dragndrop.ts +++ b/src/dragndrop.ts @@ -3,7 +3,6 @@ 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' @@ -13,9 +12,6 @@ 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) => { @@ -49,34 +45,6 @@ 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((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 diff --git a/src/entities.ts b/src/entities.ts index 674f91ef..68e18df3 100644 --- a/src/entities.ts +++ b/src/entities.ts @@ -4,9 +4,8 @@ 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 { miscUiState } from './globalState' import { EntityStatus } from './mineflayer/entityStatus' @@ -14,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, }) @@ -44,7 +43,7 @@ customEvents.on('gameLoaded', () => { updateAutoJump() const playerPerAnimation = {} as Record - const checkEntityData = (e: Entity) => { + const entityData = (e: Entity) => { if (!e.username) return window.debugEntityMetadata ??= {} window.debugEntityMetadata[e.username] = e @@ -53,13 +52,6 @@ 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 @@ -69,24 +61,14 @@ customEvents.on('gameLoaded', () => { if (!tracking) continue const e = bot.entities[id] if (!e) continue - const speed = info.avgVel + const speed = info.avgSpeed const WALKING_SPEED = 0.03 const SPRINTING_SPEED = 0.18 - 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 - - const newAnimation = - isCrouched ? (isWalking ? 'crouchWalking' : 'crouch') - : isWalking ? (isSprinting ? 'running' : 'walking') - : 'idle' + const newAnimation = isWalking ? (isSprinting ? 'running' : 'walking') : 'idle' if (newAnimation !== playerPerAnimation[id]) { - // 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) - } + getThreeJsRendererMethods()?.playEntityAnimation(e.id, newAnimation) playerPerAnimation[id] = newAnimation } } @@ -96,25 +78,6 @@ 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,243 +89,60 @@ 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) => { - 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) => { - checkEntityData(e) - if (appViewer.playerState.reactive.cameraSpectatingEntity === e.id) { - updateCamera(e) - } + entityData(e) }) bot._client.on('entity_velocity', (packet) => { const e = bot.entities[packet.entityId] if (!e) return - checkEntityData(e) + entityData(e) }) for (const entity of Object.values(bot.entities)) { if (entity !== bot.entity) { - checkEntityData(entity) + entityData(entity) } } - // Track bot entity initially - trackBotEntity() - - bot.on('entitySpawn', (e) => { - checkEntityData(e) - if (appViewer.playerState.reactive.cameraSpectatingEntity === e.id) { - updateCamera(e) - } - }) - 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) { - 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) - } - } - }) - - 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 - } + bot.on('entitySpawn', entityData) + bot.on('entityUpdate', entityData) + bot.on('entityEquip', entityData) // Texture override from packet properties - const updateSkin = (player: import('mineflayer').Player) => { - if (!player.uuid || !player.username || !player.skinData) return - - 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 - } + bot._client.on('player_info', (packet) => { + 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') } - // even if not found, still record to cache - void getThreeJsRendererMethods()!.updatePlayerSkin(entityId, player.username, player.uuid, skinUrl ?? true, capeUrl) - } catch (err) { - reportError(new Error('Error applying skin texture:', { cause: err })) - } - } + 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 - bot.on('playerJoined', updateSkin) - bot.on('playerUpdated', updateSkin) - for (const entity of Object.values(bot.players)) { - updateSkin(entity) - } - - 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)) { - 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) + // 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 + getThreeJsRendererMethods()?.updatePlayerSkin(entityId, playerEntry.player?.name, playerEntry.uuid, skinUrl, capeUrl) + } catch (err) { + console.error('Error decoding player texture:', err) } } } - }) - 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) - } - }) - }) - -// 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/env.d.ts b/src/env.d.ts deleted file mode 100644 index e565fcec..00000000 --- a/src/env.d.ts +++ /dev/null @@ -1,37 +0,0 @@ -declare namespace NodeJS { - interface ProcessEnv { - // Build configuration - NODE_ENV: 'development' | 'production' - 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?: 'true' | 'false' - CONFIG_JSON_SOURCE?: 'BUNDLED' | 'REMOTE' - LOCAL_CONFIG_FILE?: string - BUILD_VERSION?: string - - // Build internals - GITHUB_REPOSITORY?: string - VERCEL_GIT_REPO_OWNER?: string - VERCEL_GIT_REPO_SLUG?: string - - // UI - MAIN_MENU_LINKS?: string - ALWAYS_MINIMAL_SERVER_UI?: 'true' | 'false' - - // App features - ENABLE_COOKIE_STORAGE?: string - COOKIE_STORAGE_PREFIX?: string - - // Build info. Release information - RELEASE_TAG?: string - RELEASE_LINK?: string - RELEASE_CHANGELOG?: string - - // Build info - INLINED_APP_CONFIG?: string - GITHUB_URL?: string - } -} diff --git a/src/flyingSquidUtils.ts b/src/flyingSquidUtils.ts index 2ae0be7c..012830d9 100644 --- a/src/flyingSquidUtils.ts +++ b/src/flyingSquidUtils.ts @@ -18,10 +18,9 @@ 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 diff --git a/src/globalDomListeners.ts b/src/globalDomListeners.ts index bfce0d42..5055c600 100644 --- a/src/globalDomListeners.ts +++ b/src/globalDomListeners.ts @@ -35,12 +35,3 @@ 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() -}) diff --git a/src/globalState.ts b/src/globalState.ts index b8982de7..bd845195 100644 --- a/src/globalState.ts +++ b/src/globalState.ts @@ -46,8 +46,6 @@ export const showModal = (elem: /* (HTMLElement & Record) | */{ re activeModalStack.push(resolved) } -window.showModal = showModal - /** * * @returns true if previous modal was restored @@ -123,7 +121,6 @@ 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/globals.d.ts b/src/globals.d.ts index 7a2c6f1f..b8741a12 100644 --- a/src/globals.d.ts +++ b/src/globals.d.ts @@ -27,14 +27,8 @@ 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: (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 11351555..1aa141c6 100644 --- a/src/globals.js +++ b/src/globals.js @@ -5,12 +5,7 @@ window.bot = undefined window.THREE = undefined window.localServer = undefined window.worldView = undefined -window.viewer = undefined // legacy -window.appViewer = undefined +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/index.ts b/src/index.ts index 7764188f..3c897619 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, { isInterestedInDownload } from './downloadAndOpenFile' +import downloadAndOpenFile from './downloadAndOpenFile' import fs from 'fs' import net, { Socket } from 'net' @@ -56,12 +56,13 @@ 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' import CustomChannelClient from './customClient' import { registerServiceWorker } from './serviceWorker' -import { appStatusState, lastConnectOptions, quickDevReconnect } from './react/AppStatusProvider' +import { appStatusState, lastConnectOptions } from './react/AppStatusProvider' import { fsState } from './loadSave' import { watchFov } from './rendererUtils' @@ -73,10 +74,10 @@ import { showNotification } from './react/NotificationProvider' import { saveToBrowserMemory } from './react/PauseScreen' import './devReload' import './water' -import { ConnectOptions, getVersionAutoSelect, downloadOtherGameData, downloadAllMinecraftData, loadMinecraftData } from './connect' +import { ConnectOptions, getVersionAutoSelect, downloadOtherGameData, downloadAllMinecraftData } from './connect' import { ref, subscribe } from 'valtio' import { signInMessageState } from './react/SignInMessageProvider' -import { findServerPassword, updateAuthenticatedAccountData, updateLoadedServerData, updateServerConnectionHistory } from './react/serversStorage' +import { updateAuthenticatedAccountData, updateLoadedServerData, updateServerConnectionHistory } from './react/serversStorage' import { mainMenuState } from './react/MainMenuRenderApp' import './mobileShim' import { parseFormattedMessagePacket } from './botUtils' @@ -96,7 +97,6 @@ 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,7 +166,6 @@ export async function connect (connectOptions: ConnectOptions) { }) } - appStatusState.showReconnect = false loadingTimerState.loading = true loadingTimerState.start = Date.now() miscUiState.hasErrors = false @@ -210,17 +209,12 @@ 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 { alwaysReconnect } = appQueryParams - if ((!wasKicked && miscUiState.appConfig?.allowAutoConnect && appQueryParams.autoConnect && hadConnected) || (alwaysReconnect)) { - if (alwaysReconnect === 'quick' || alwaysReconnect === 'fast') { - quickDevReconnect() - } else { - location.reload() - } + const hadConnected = !!bot + if (!wasKicked && miscUiState.appConfig?.allowAutoConnect && appQueryParams.autoConnect && hadConnected) { + location.reload() } errorAbortController.abort() ended = true @@ -235,12 +229,8 @@ export async function connect (connectOptions: ConnectOptions) { bot.emit('end', '') bot.removeAllListeners() bot._client.removeAllListeners() - bot._client = { - //@ts-expect-error - write (packetName) { - console.warn('Tried to write packet', packetName, 'after bot was destroyed') - } - } + //@ts-expect-error TODO? + bot._client = undefined //@ts-expect-error window.bot = bot = undefined } @@ -286,10 +276,6 @@ 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 @@ -304,7 +290,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') ?? ''}` }, artificialDelay: appQueryParams.addPing ? Number(appQueryParams.addPing) : undefined }) + net['setProxy']({ hostname: proxy.host, port: proxy.port, headers: { Authorization: `Bearer ${new URLSearchParams(location.search).get('token') ?? ''}` } }) } const renderDistance = singleplayer ? renderDistanceSingleplayer : multiplayerRenderDistance @@ -345,7 +331,6 @@ export async function connect (connectOptions: ConnectOptions) { await progress.executeWithMessage( 'Processing downloaded Minecraft data', async () => { - await loadMinecraftData(version) await appViewer.resourcesManager.loadSourceData(version) } ) @@ -454,7 +439,7 @@ export async function connect (connectOptions: ConnectOptions) { } else { initialLoadingText = 'We have no idea what to do' } - progress.setMessage(initialLoadingText) + setLoadingScreenStatus(initialLoadingText) if (parsedServer.isWebSocket) { loadingTimerState.networkOnlyStart = Date.now() @@ -463,20 +448,17 @@ export async function connect (connectOptions: ConnectOptions) { let newTokensCacheResult = null as any const cachedTokens = typeof connectOptions.authenticatedAccount === 'object' ? connectOptions.authenticatedAccount.cachedTokens : {} - let authData: Awaited> | undefined - if (connectOptions.authenticatedAccount) { - authData = await microsoftAuthflow({ - tokenCaches: cachedTokens, - proxyBaseUrl: connectOptions.proxy, - setProgressText (text) { - progress.setMessage(text) - }, - setCacheResult (result) { - newTokensCacheResult = result - }, - connectingServer: server.host - }) - } + const authData = connectOptions.authenticatedAccount ? await microsoftAuthflow({ + tokenCaches: cachedTokens, + proxyBaseUrl: connectOptions.proxy, + setProgressText (text) { + setLoadingScreenStatus(text) + }, + setCacheResult (result) { + newTokensCacheResult = result + }, + connectingServer: server.host + }) : undefined if (p2pMultiplayer) { clientDataStream = await connectToPeer(connectOptions.peerId!, connectOptions.peerOptions) @@ -587,7 +569,6 @@ 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() } @@ -710,7 +691,6 @@ export async function connect (connectOptions: ConnectOptions) { onBotCreate() bot.once('login', () => { - errorAbortController.abort() loadingTimerState.networkOnlyStart = 0 progress.setMessage('Loading world') }) @@ -728,7 +708,7 @@ export async function connect (connectOptions: ConnectOptions) { resolve() unsub() } else { - const perc = Math.round(appViewer.rendererState.world.chunksLoaded.size / appViewer.nonReactiveState.world.chunksTotalNumber * 100) + const perc = Math.round(appViewer.rendererState.world.chunksLoaded.length / appViewer.rendererState.world.chunksTotalNumber * 100) progress?.reportProgress('chunks', perc / 100) } }) @@ -747,12 +727,9 @@ 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?.() @@ -764,7 +741,7 @@ export async function connect (connectOptions: ConnectOptions) { try { if (p2pConnectTimeout) clearTimeout(p2pConnectTimeout) - playerState.reactive.onlineMode = !!connectOptions.authenticatedAccount + playerState.onlineMode = !!connectOptions.authenticatedAccount progress.setMessage('Placing blocks (starting viewer)') if (!connectOptions.worldStateFileContents || connectOptions.worldStateFileContents.length < 3 * 1024 * 1024) { @@ -777,10 +754,9 @@ export async function connect (connectOptions: ConnectOptions) { } connectOptions.onSuccessfulPlay?.() updateDataAfterJoin() - const password = findServerPassword() - if (password) { + if (connectOptions.autoLoginPassword) { setTimeout(() => { - bot.chat(`/login ${password}`) + bot.chat(`/login ${connectOptions.autoLoginPassword}`) }, 500) } @@ -788,11 +764,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() // Bot position callback const botPosition = () => { @@ -844,32 +818,11 @@ 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) { handleError(err) } - hadConnected = true } // don't use spawn event, player can be dead bot.once(spawnEarlier ? 'forcedMove' : 'health', displayWorld) @@ -893,7 +846,37 @@ 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 @@ -929,148 +912,90 @@ document.body.addEventListener('touchstart', (e) => { }, { passive: false }) // #endregion -// 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 && localStorage.lastConnectOptions && process.env.NODE_ENV === 'development') { - const lastConnect = JSON.parse(localStorage.lastConnectOptions ?? {}) - return waitForConfigFsLoad(async () => { +// 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 ?? {}) void connect({ botVersion: appQueryParams.version ?? undefined, ...lastConnect, ip: appQueryParams.ip || undefined }) - }) - } - - if (appQueryParams.singleplayer === '1' || appQueryParams.sp === '1') { - return waitForConfigFsLoad(async () => { - loadSingleplayer({}, { - worldFolder: undefined, - ...appQueryParams.version ? { version: appQueryParams.version } : {} - }) - }) - } - 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`) - } + return } - return waitForConfigFsLoad(enterSave) - } - - if (appQueryParams.ip || appQueryParams.proxy) { - const openServerAction = () => { - if (appQueryParams.autoConnect && miscUiState.appConfig?.allowAutoConnect) { - void connect({ - server: appQueryParams.ip, - proxy: getCurrentProxy(), - botVersion: appQueryParams.version ?? undefined, - username: getCurrentUsername()!, - }) - 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' }) + } } - - setLoadingScreenStatus(undefined) - if (appQueryParams.onlyConnect || process.env.ALWAYS_MINIMAL_SERVER_UI === 'true') { - showModal({ reactType: 'only-connect-server' }) + 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 { - showModal({ reactType: 'editServer' }) + openServerEditor() } } - // showModal({ reactType: 'empty' }) - return waitForConfigFsLoad(openServerAction) - } - - 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 + 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 + }) + } }) - 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 }) + if (appQueryParams.serversList) { + showModal({ reactType: 'serversList' }) } - return - } - if (appQueryParams.serversList && !miscUiState.appConfig?.appParams?.serversList) { - // open UI only if it's in URL - showModal({ reactType: 'serversList' }) - } + const viewerWsConnect = appQueryParams.viewerConnect + if (viewerWsConnect) { + void connect({ + username: `viewer-${Math.random().toString(36).slice(2, 10)}`, + viewerWsConnect, + }) + } - if (isInterestedInDownload()) { - void downloadAndOpenFile() - } - - void possiblyHandleStateVariable() -} - -try { - maybeEnterGame() -} catch (err) { - console.error(err) - alert(`Something went wrong: ${err}`) + if (appQueryParams.modal) { + const modals = appQueryParams.modal.split(',') + for (const modal of modals) { + showModal({ reactType: modal }) + } + } + }, (err) => { + console.error(err) + alert(`Something went wrong: ${err}`) + }) } // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion @@ -1081,5 +1006,6 @@ if (initialLoader) { } window.pageLoaded = true +void possiblyHandleStateVariable() appViewer.waitBackendLoadPromises.push(appStartup()) registerOpenBenchmarkListener() diff --git a/src/interactionShapesGenerated.json b/src/interactionShapesGenerated.json index 804952e0..afd3ce0f 100644 --- a/src/interactionShapesGenerated.json +++ b/src/interactionShapesGenerated.json @@ -1318,55 +1318,47 @@ 13 ], "lever": { - "face=floor,facing=east": [ - 4, - 0, - 5, - 12, - 6, - 11 - ], - "face=floor,facing=north": [ - 5, - 0, - 4, - 11, - 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, + 0, 5, 12, - 16, + 6, 11 ], "face=ceiling,facing=north": [ 5, - 10, + 0, 4, 11, - 16, + 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, + 5, + 12, + 16, + 11 + ], + "face=floor,facing=north": [ 5, 10, 4, @@ -1374,7 +1366,15 @@ 16, 12 ], - "face=ceiling,facing=west": [ + "face=floor,facing=south": [ + 5, + 10, + 4, + 11, + 16, + 12 + ], + "face=floor,facing=west": [ 4, 10, 5, diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts index d40260df..2906177b 100644 --- a/src/inventoryWindows.ts +++ b/src/inventoryWindows.ts @@ -9,10 +9,8 @@ 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 { loadSkinFromUsername } from 'renderer/viewer/lib/utils/skins' +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' @@ -23,13 +21,10 @@ 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' -import { modelViewerState } from './react/OverlayModelViewer' -const loadedImagesCache = new Map() +const loadedImagesCache = new Map() const cleanLoadedImagesCache = () => { loadedImagesCache.delete('blocks') - loadedImagesCache.delete('items') } let lastWindow: ReturnType @@ -42,34 +37,6 @@ export const jeiCustomCategories = proxy({ value: [] as Array<{ id: string, categoryTitle: string, items: any[] }> }) -let remotePlayerSkin: string | undefined | Promise - -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 @@ -87,23 +54,12 @@ 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, maybeParseNbtJson(win.title)) + openWindow(implementedWindow) } else if (options.unimplementedContainers) { - openWindow('ChestWin', maybeParseNbtJson(win.title)) + openWindow('ChestWin') } else { // todo format displayClientChat(`[client error] cannot open unimplemented window ${win.id} (${win.type}). Slots: ${win.slots.map(item => getItemName(item)).filter(Boolean).join(', ')}`) @@ -164,7 +120,6 @@ export const onGameLoad = () => { if (!appViewer.resourcesManager['_inventoryChangeTracked']) { appViewer.resourcesManager['_inventoryChangeTracked'] = true const texturesChanged = () => { - cleanLoadedImagesCache() if (!lastWindow) return upWindowItemsLocal() upJei(lastJeiSearch) @@ -174,12 +129,11 @@ export const onGameLoad = () => { } } -const getImageSrc = (path): string | HTMLImageElement | ImageBitmap => { +const getImageSrc = (path): string | HTMLImageElement => { 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 '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 @@ -202,20 +156,12 @@ 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() } 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 @@ -229,6 +175,80 @@ 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 & { resolvedModel: BlockModel }, + scale?: number, + slice?: number[], + modelName?: string, + image?: HTMLImageElement +} | undefined => { + let itemModelName = model.modelName + 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 + + + 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: ${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 @@ -248,15 +268,10 @@ const itemToVisualKey = (slot: RenderItem | Item | null) => { slot['metadata'], slot.nbt ? JSON.stringify(slot.nbt) : '', slot['components'] ? JSON.stringify(slot['components']) : '', - appViewer.resourcesManager.currentResources!.guiAtlasVersion, + activeGuiAtlas.version, ].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, isJei = false) => { const newSlots = slots.map((slot, i) => { if (!slot) return null @@ -266,7 +281,6 @@ const mapSlots = (slots: Array, isJei = false) => { const newKey = itemToVisualKey(slot) slot['cacheKey'] = i + '|' + newKey if (oldKey && oldKey === newKey) { - validateSlot(lastMappedSlots[i], i) return lastMappedSlots[i] } } @@ -274,8 +288,8 @@ const mapSlots = (slots: Array, 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, appViewer.playerState.reactive) - const slotCustomProps = renderSlot({ modelName, originalItemName: slot.name }, appViewer.resourcesManager, debugIsQuickbar) + const modelName = getItemModelName(slot, { 'minecraft:display_context': 'gui', }, appViewer.resourcesManager) + const slotCustomProps = renderSlot({ modelName, originalItemName: slot.name }, debugIsQuickbar) const itemCustomName = getItemName(slot) Object.assign(slot, { ...slotCustomProps, displayName: itemCustomName ?? slot.displayName }) //@ts-expect-error @@ -285,13 +299,12 @@ const mapSlots = (slots: Array, isJei = false) => { const { icon, ...rest } = slot return rest } - validateSlot(slot, i) } catch (err) { inGameError(err) } return slot }) - lastMappedSlots = JSON.parse(JSON.stringify(newSlots)) + lastMappedSlots = newSlots return newSlots } @@ -300,7 +313,6 @@ 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) => { @@ -327,8 +339,6 @@ 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 'minecraft:anvil': 'AnvilWin', @@ -397,7 +407,7 @@ const upWindowItemsLocal = () => { } let skipClosePacketSending = false -const openWindow = (type: string | undefined, title: string | any = undefined) => { +const openWindow = (type: string | 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) { @@ -418,20 +428,15 @@ const openWindow = (type: string | undefined, title: string | any = undefined) = lastWindow.destroy() lastWindow = null as any lastWindowType = null - window.inventory = null + window.lastWindow = lastWindow 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 - window.inventory = inv + const title = bot.currentWindow?.title const PrismarineChat = PrismarineChatLoader(bot.version) try { inv.canvasManager.children[0].customTitleText = title ? @@ -470,7 +475,6 @@ 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 { @@ -502,7 +506,6 @@ 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]) } } @@ -571,7 +574,7 @@ const getResultingRecipe = (slots: Array, 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! @@ -599,7 +602,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, @@ -644,7 +647,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/loadSave.ts b/src/loadSave.ts index f1676cff..7c9f7277 100644 --- a/src/loadSave.ts +++ b/src/loadSave.ts @@ -85,6 +85,7 @@ export const loadSave = async (root = '/world', connectOptions?: Partial void, doCopy const params = host ? parseUrl(host) : undefined const peer = new Peer({ debug: 3, - secure: true, ...params }) peerInstance = peer @@ -120,18 +119,11 @@ export const openToWanAndCopyJoinLink = async (writeText: (text) => void, doCopy await copyJoinLink() resolve('Copied join link to clipboard') }) - timeout = setTimeout(async () => { + timeout = setTimeout(() => { if (!hadErrorReported && timeout !== undefined) { - 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)') - } + writeText('timeout') } + resolve('Failed to open to wan (timeout)') }, 6000) // fallback @@ -147,7 +139,7 @@ export const openToWanAndCopyJoinLink = async (writeText: (text) => void, doCopy } }) }) - if (peerInstance && !peerInstance.open) { + if (!peerInstance.open) { destroy() } miscUiState.wanOpening = false @@ -208,7 +200,7 @@ export const connectToPeer = async (peerId: string, options: ConnectPeerOptions const clientDuplex = new CustomDuplex({}, (data) => { // todo debug until play state // console.debug('sending', data.toString()) - void connection.send(data) + connection.send(data) }) connection.on('data', (data: any) => { console.debug('received', Buffer.from(data).toString()) diff --git a/src/microsoftAuthflow.ts b/src/microsoftAuthflow.ts index d759a7dc..00f4e675 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(`Auth server error: ${json.error}`) + if (json.error) throw new Error(json.error) if (json.token) result = json if (json.newCache) setCacheResult(json.newCache) } diff --git a/src/mineflayer/items.ts b/src/mineflayer/items.ts index 48d0dfe0..45638cd4 100644 --- a/src/mineflayer/items.ts +++ b/src/mineflayer/items.ts @@ -1,10 +1,11 @@ import mojangson from 'mojangson' import nbt from 'prismarine-nbt' import { fromFormattedString } from '@xmcl/text-component' -import { getItemSelector, ItemSpecificContextProperties, PlayerStateRenderer } from 'renderer/viewer/lib/basePlayerState' +import { ItemSpecificContextProperties } from 'renderer/viewer/lib/basePlayerState' import { getItemDefinition } from 'mc-assets/dist/itemDefinitions' import { MessageFormatPart } from '../chatUtils' -import { ResourcesManager, ResourcesManagerCommon, ResourcesManagerTransferred } from '../resourcesManager' +import { ResourcesManager } from '../resourcesManager' +import { playerState } from './playerState' type RenderSlotComponent = { type: string, @@ -32,7 +33,7 @@ type PossibleItemProps = { display?: { Name?: JsonString } // {"text":"Knife","color":"white","italic":"true"} } -export const getItemMetadata = (item: GeneralInputItem, resourcesManager: ResourcesManagerCommon) => { +export const getItemMetadata = (item: GeneralInputItem, resourcesManager: ResourcesManager) => { let customText = undefined as string | any | undefined let customModel = undefined as string | undefined @@ -58,17 +59,9 @@ export const getItemMetadata = (item: GeneralInputItem, resourcesManager: Resour } if (customModelDataDefinitions) { const customModelDataComponent: any = componentMap.get('custom_model_data') - 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]) { + if (customModelDataComponent?.data && typeof customModelDataComponent.data === 'number') { + const customModelData = customModelDataComponent.data + if (customModelDataDefinitions[customModelData]) { customModel = customModelDataDefinitions[customModelData] } } @@ -98,9 +91,8 @@ export const getItemMetadata = (item: GeneralInputItem, resourcesManager: Resour } -export const getItemNameRaw = (item: Pick | null, resourcesManager: ResourcesManagerCommon) => { - if (!item) return '' - const { customText } = getItemMetadata(item as GeneralInputItem, resourcesManager) +export const getItemNameRaw = (item: Pick | null, resourcesManager: ResourcesManager) => { + const { customText } = getItemMetadata(item as any, resourcesManager) if (!customText) return try { if (typeof customText === 'object') { @@ -119,14 +111,14 @@ export const getItemNameRaw = (item: Pick } } -export const getItemModelName = (item: GeneralInputItem, specificProps: ItemSpecificContextProperties, resourcesManager: ResourcesManagerCommon, playerState: PlayerStateRenderer) => { +export const getItemModelName = (item: GeneralInputItem, specificProps: ItemSpecificContextProperties, resourcesManager: ResourcesManager) => { let itemModelName = item.name const { customModel } = getItemMetadata(item, resourcesManager) if (customModel) { itemModelName = customModel } - const itemSelector = getItemSelector(playerState, { + const itemSelector = playerState.getItemSelector({ ...specificProps }) const modelFromDef = getItemDefinition(appViewer.resourcesManager.itemsDefinitionsStore, { diff --git a/src/mineflayer/mc-protocol.ts b/src/mineflayer/mc-protocol.ts index cd21d01f..2376cd03 100644 --- a/src/mineflayer/mc-protocol.ts +++ b/src/mineflayer/mc-protocol.ts @@ -1,46 +1,13 @@ -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' 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) => { @@ -68,7 +35,7 @@ setInterval(() => { }, 1000) -export const getServerInfo = async (ip: string, port?: number, preferredVersion = getVersionAutoSelect(), ping = false, progressReporter?: ProgressReporter, setProxyParams?: ProxyParams) => { +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 @@ -76,8 +43,6 @@ 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) { @@ -94,46 +59,3 @@ 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 -} - -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, - artificialDelay: appQueryParams.addPing ? Number(appQueryParams.addPing) : undefined - }) - return { - proxy - } -} diff --git a/src/mineflayer/minecraft-protocol-extra.ts b/src/mineflayer/minecraft-protocol-extra.ts index 65260979..e8216a00 100644 --- a/src/mineflayer/minecraft-protocol-extra.ts +++ b/src/mineflayer/minecraft-protocol-extra.ts @@ -3,11 +3,13 @@ import clientAutoVersion from 'minecraft-protocol/src/client/autoVersion' export const pingServerVersion = async (ip: string, port?: number, mergeOptions: Record = {}) => { const fakeClient = new EventEmitter() as any + fakeClient.on('error', (err) => { + throw new Error(err.message ?? err) + }) const options = { host: ip, port, - noPongTimeout: 10_000, - closeTimeout: 20_000, + noPongTimeout: Infinity, // disable timeout ...mergeOptions, } let latency = 0 @@ -17,28 +19,12 @@ export const pingServerVersion = async (ip: string, port?: number, mergeOptions: fullInfo = res }] - // TODO use client.socket.destroy() instead of client.end() for faster cleanup - clientAutoVersion(fakeClient, options) - await Promise.race([ - new Promise((resolve, reject) => { - fakeClient.once('connect_allowed', () => { - resolve() - }) - }), - new Promise((resolve, reject) => { - fakeClient.on('error', (err) => { - reject(new Error(err.message ?? err)) - }) - if (mergeOptions.stream) { - mergeOptions.stream.on('end', (err) => { - setTimeout(() => { - reject(new Error('Connection closed. Please report if you see this but the server is actually fine.')) - }) - }) - } - }) - ]) + // TODO! use client.socket.destroy() instead of client.end() for faster cleanup + await clientAutoVersion(fakeClient, options) + await new Promise((resolve, reject) => { + fakeClient.once('connect_allowed', resolve) + }) return { version: fakeClient.version, latency, diff --git a/src/mineflayer/playerState.ts b/src/mineflayer/playerState.ts index 33f7af77..e88933b9 100644 --- a/src/mineflayer/playerState.ts +++ b/src/mineflayer/playerState.ts @@ -1,28 +1,45 @@ +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 { getInitialPlayerState, getPlayerStateUtils, PlayerStateReactive, PlayerStateRenderer, PlayerStateUtils } from 'renderer/viewer/lib/basePlayerState' -import { subscribe } from 'valtio' -import { subscribeKey } from 'valtio/utils' +import TypedEmitter from 'typed-emitter' +import { ItemSelector } from 'mc-assets/dist/itemDefinitions' +import { proxy } from 'valtio' import { gameAdditionalState } from '../globalState' -import { options } from '../optionsStorage' -/** - * 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 { +export class PlayerStateManager implements IPlayerState { disableStateUpdates = false + private static instance: PlayerStateManager + readonly events = new EventEmitter() as TypedEmitter + // 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 - ready = false + private ready = false + onlineMode = false + get username () { + return bot.player?.username ?? '' + } - reactive: PlayerStateReactive - utils: PlayerStateUtils + reactive: IPlayerState['reactive'] = new BasePlayerState().reactive + + static getInstance (): PlayerStateManager { + if (!this.instance) { + this.instance = new PlayerStateManager() + } + return this.instance + } constructor () { + this.updateState = this.updateState.bind(this) customEvents.on('mineflayerBotCreated', () => { this.ready = false bot.on('inject_allowed', () => { @@ -30,42 +47,12 @@ export class PlayerStateControllerMain { 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.reactive.perspective = options.defaultPerspective - this.utils = getPlayerStateUtils(this.reactive) - this.onBotCreatedOrGameJoined() - - const handleDimensionData = (data) => { - let hasSkyLight = 1 - try { - hasSkyLight = data.dimension.value.has_skylight.value - } catch {} - this.reactive.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.updateMovementState() - }) + bot.on('move', this.updateState) // Item tracking bot.on('heldItemChanged', () => { @@ -74,22 +61,8 @@ export class PlayerStateControllerMain { 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.reactive.itemUsageTicks++ - updateSneakingOrFlying() - }) - // todo move from gameAdditionalState to reactive directly - subscribeKey(gameAdditionalState, 'isSneaking', () => { - updateSneakingOrFlying() - }) - subscribeKey(gameAdditionalState, 'isFlying', () => { - updateSneakingOrFlying() + if (this.isUsingItem) this.itemUsageTicks++ }) // Initial held items setup @@ -100,16 +73,10 @@ export class PlayerStateControllerMain { this.reactive.gameMode = bot.game.gameMode }) this.reactive.gameMode = bot.game?.gameMode - - customEvents.on('gameLoaded', () => { - this.reactive.team = bot.teamMap[bot.username] - }) - - this.watchReactive() } // #region Movement and Physics State - private updateMovementState () { + private updateState () { if (!bot?.entity || this.disableStateUpdates) return const { velocity } = bot.entity @@ -122,7 +89,7 @@ export class PlayerStateControllerMain { const deltaTime = now - this.lastUpdateTime this.lastUpdateTime = now - // this.lastVelocity = velocity + this.lastVelocity = velocity // Update time off ground if (isOnGround) { @@ -131,26 +98,60 @@ export class PlayerStateControllerMain { this.timeOffGround += deltaTime } - if (gameAdditionalState.isSneaking || gameAdditionalState.isFlying || (this.timeOffGround > OFF_GROUND_THRESHOLD)) { - this.reactive.movementState = 'SNEAKING' + 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.reactive.movementState = Math.abs(velocity.x) > SPRINTING_VELOCITY || Math.abs(velocity.z) > SPRINTING_VELOCITY + this.movementState = Math.abs(velocity.x) > SPRINTING_VELOCITY || Math.abs(velocity.z) > SPRINTING_VELOCITY ? 'SPRINTING' : 'WALKING' } else { - this.reactive.movementState = 'NOT_MOVING' + this.movementState = 'NOT_MOVING' } } + getMovementState (): MovementState { + return this.movementState + } + + getVelocity (): Vec3 { + return this.lastVelocity + } + + getEyeHeight (): number { + return bot.controlState.sneak ? 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.reactive.heldItemOff = undefined + this.offHandItem = undefined } else { - this.reactive.heldItemMain = undefined + this.heldItem = undefined } + this.events.emit('heldItemChanged', undefined, isLeftHand) return } @@ -165,36 +166,42 @@ export class PlayerStateControllerMain { } if (isLeftHand) { - this.reactive.heldItemOff = item + this.offHandItem = item } else { - this.reactive.heldItemMain = item + this.heldItem = item } - // this.events.emit('heldItemChanged', item, isLeftHand) + this.events.emit('heldItemChanged', item, isLeftHand) } startUsingItem () { if (this.isUsingItem) return this.isUsingItem = true - this.reactive.itemUsageTicks = 0 + this.itemUsageTicks = 0 } stopUsingItem () { this.isUsingItem = false - this.reactive.itemUsageTicks = 0 + this.itemUsageTicks = 0 } getItemUsageTicks (): number { - return this.reactive.itemUsageTicks + return this.itemUsageTicks } - watchReactive () { - subscribeKey(this.reactive, 'eyeHeight', () => { - appViewer.backend?.updateCamera(bot.entity.position, bot.entity.yaw, bot.entity.pitch) - }) + 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 = new PlayerStateControllerMain() +export const playerState = PlayerStateManager.getInstance() window.playerState = playerState diff --git a/src/mineflayer/plugins/mouse.ts b/src/mineflayer/plugins/mouse.ts index 14e19345..4e82b770 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 || bot.game.gameMode === 'spectator') { + if (!data?.block) { playerState.reactive.lookingAtBlock = undefined return } @@ -27,10 +27,6 @@ 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) @@ -110,7 +106,7 @@ const domListeners = (bot: Bot) => { }, { signal: abortController.signal }) bot.mouse.beforeUpdateChecks = () => { - if (!document.hasFocus() || !isGameActive(true)) { + if (!document.hasFocus()) { // deactive all buttons bot.mouse.buttons.fill(false) } diff --git a/src/mineflayer/plugins/ping.ts b/src/mineflayer/plugins/ping.ts index d6a23554..9753e4ed 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 ?? -1 + if (versionToNumber(bot.version) < versionToNumber('1.20.2')) return bot.player.ping return new Promise((resolve) => { const curId = pingId++ bot._client.write('ping_request', { id: BigInt(curId) }) diff --git a/src/mineflayer/websocket-core.ts b/src/mineflayer/websocket-core.ts index f8163102..482f0def 100644 --- a/src/mineflayer/websocket-core.ts +++ b/src/mineflayer/websocket-core.ts @@ -15,18 +15,13 @@ class CustomDuplex extends Duplex { } export const getWebsocketStream = async (host: string) => { - const baseProtocol = host.startsWith('ws://') ? 'ws' : 'wss' + const baseProtocol = location.protocol === 'https:' ? 'wss' : host.startsWith('ws://') ? 'ws' : 'wss' const hostClean = host.replace('ws://', '').replace('wss://', '') - 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 ws = new WebSocket(`${baseProtocol}://${hostClean}`) const clientDuplex = new CustomDuplex(undefined, data => { ws.send(data) }) - clientDuplex.on('error', () => {}) - ws.addEventListener('message', async message => { let { data } = message if (data instanceof Blob) { @@ -38,14 +33,10 @@ 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) => { diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx index 0cb0fe1e..20514489 100644 --- a/src/optionsGuiScheme.tsx +++ b/src/optionsGuiScheme.tsx @@ -1,4 +1,4 @@ -import { useEffect, useRef, useState } from 'react' +import { useRef, useState } from 'react' import { useSnapshot } from 'valtio' import { openURL } from 'renderer/viewer/lib/simpleUtils' import { noCase } from 'change-case' @@ -14,13 +14,12 @@ 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 { ClientMod, getAllMods, modsUpdateStatus } from './clientMods' +import { modsUpdateStatus } from './clientMods' import supportedVersions from './supportedVersions.mjs' 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> } & { custom? }> @@ -91,7 +90,8 @@ export const guiOptionsScheme: { }, lowMemoryMode: { text: 'Low Memory Mode', - enableWarning: 'Enabling it will make chunks load ~4x slower. When in the game, app needs to be reloaded to apply this setting.', + enableWarning: 'Enabling it will make chunks load ~4x slower', + disabledDuringGame: true }, starfieldRendering: {}, renderEntities: {}, @@ -110,9 +110,6 @@ export const guiOptionsScheme: { 'none' ], }, - rendererPerfDebugOverlay: { - text: 'Performance Debug', - } }, { custom () { @@ -235,14 +232,9 @@ export const guiOptionsScheme: { custom () { const { appConfig } = useSnapshot(miscUiState) const modsUpdateSnapshot = useSnapshot(modsUpdateStatus) - const [clientMods, setClientMods] = useState([]) - useEffect(() => { - void getAllMods().then(setClientMods) - }, []) if (appConfig?.showModsButton === false) return null - const enabledModsCount = Object.keys(clientMods.filter(mod => mod.enabled)).length - return } }, @@ -686,7 +616,53 @@ export const guiOptionsScheme: { custom () { return } }, @@ -716,7 +692,7 @@ const Category = ({ children }) =>
{children}
-const UiToggleButton = ({ name, addUiText = false, label = noCase(name) }: { name: string, addUiText?: boolean, label?: string }) => { +const UiToggleButton = ({ name, addUiText = false, label = noCase(name) }) => { const { disabledUiParts } = useSnapshot(options) const currentlyDisabled = disabledUiParts.includes(name) diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts index 22d5ef26..61dfa87f 100644 --- a/src/optionsStorage.ts +++ b/src/optionsStorage.ts @@ -5,10 +5,155 @@ 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, + + // 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, + 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 + renderDebug: (isDev ? 'advanced' : 'basic') as 'none' | 'advanced' | 'basic', + + // 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 +} + +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 ?? [] @@ -40,15 +185,15 @@ const migrateOptions = (options: Partial>) => { 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] } } - delete appStorage['options'] + appStorage.options = {} } } @@ -160,5 +305,3 @@ export const getAppLanguage = () => { } return options.language } - -export { defaultOptions } from './defaultOptions' diff --git a/src/packetsReplay/replayPackets.ts b/src/packetsReplay/replayPackets.ts index 54b3d652..87d03a9c 100644 --- a/src/packetsReplay/replayPackets.ts +++ b/src/packetsReplay/replayPackets.ts @@ -59,7 +59,6 @@ export const startLocalReplayServer = (contents: string) => { const server = createServer({ Server: LocalServer as any, version: header.minecraftVersion, - keepAlive: false, 'online-mode': false }) @@ -195,11 +194,9 @@ const mainPacketsReplayer = async (client: ServerClient, packets: ParsedReplayPa continue } playServerPacket(packet.name, packet.params) - if (packet.diff) { - await new Promise(resolve => { - setTimeout(resolve, packet.diff * packetsReplayState.speed + ADDITIONAL_DELAY * (packetsReplayState.customButtons.packetsSenderDelay.state ? 1 : 0)) - }) - } + 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) { diff --git a/src/react/AddServerOrConnect.tsx b/src/react/AddServerOrConnect.tsx index 36fd5264..08ef7f29 100644 --- a/src/react/AddServerOrConnect.tsx +++ b/src/react/AddServerOrConnect.tsx @@ -29,9 +29,10 @@ interface Props { accounts?: string[] authenticatedAccounts?: number versions?: string[] + allowAutoConnect?: boolean } -export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQs, onQsConnect, placeholders, accounts, versions }: Props) => { +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 const qsParamIp = parseQs ? appQueryParams.ip : undefined @@ -39,12 +40,14 @@ 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) const [serverName, setServerName] = React.useState(initialData?.name ?? qsParamName ?? '') - const [serverIp, setServerIp] = React.useState(parsedQsIp.serverIpFull || parsedInitialIp.serverIpFull || '') + 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 ?? '') @@ -58,7 +61,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 + let ipFinal = serverIp.includes(':') ? serverIp : `${serverIp}${serverPort ? `:${serverPort}` : ''}` ipFinal = ipFinal.replace(/:$/, '') const commonUseOptions: BaseServerInfo = { name: serverName, @@ -116,10 +119,13 @@ 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', 'wss://play.webmc.fun'] - // pick random example - const example = serverExamples[Math.floor(Math.random() * serverExamples.length)] return
+ {!lockConnect && <> +
+ setServerName(value)} placeholder='Defaults to IP' /> +
+ } - {!lockConnect && <> -
- setServerName(value)} placeholder='Defaults to IP' /> -
- } + setServerPort(value)} placeholder={serverIp.startsWith('ws://') || serverIp.startsWith('wss://') ? '' : '25565'} /> {isSmallHeight ?
:
Overrides:
}
- {displayConnectButton ? translate('Save') : {translate('Save')}} + {displayConnectButton ? 'Save' : Save} } {displayConnectButton && ( @@ -238,7 +244,7 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ onQsConnect?.(commonUseOptions) }} > - {translate('Connect')} + Connect
)} diff --git a/src/react/AppStatusProvider.tsx b/src/react/AppStatusProvider.tsx index 9c7b34ac..4a81f88e 100644 --- a/src/react/AppStatusProvider.tsx +++ b/src/react/AppStatusProvider.tsx @@ -54,17 +54,6 @@ 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) @@ -116,6 +105,13 @@ export default () => { } }, [isOpen]) + const reconnect = () => { + resetAppStatusState() + window.dispatchEvent(new window.CustomEvent('connect', { + detail: lastConnectOptions.value + })) + } + useEffect(() => { const controller = new AbortController() window.addEventListener('keyup', (e) => { @@ -123,7 +119,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 - quickDevReconnect() + reconnect() }, { signal: controller.signal }) @@ -131,7 +127,6 @@ 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 () => { @@ -144,7 +139,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 - quickDevReconnect() + reconnect() } const lastAutoCapturedPackets = getLastAutoCapturedPackets() @@ -171,10 +166,10 @@ export default () => { } } } - return + return { actionsSlot={ <> {displayAuthButton && +
diff --git a/src/react/Chat.tsx b/src/react/Chat.tsx index d927a558..0a2843c8 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 { isStringAllowed, MessageFormatPart } from '../chatUtils' +import { MessageFormatPart } from '../chatUtils' import { MessagePart } from './MessageFormatted' import './Chat.css' import { isIos, reactKeyForMessage } from './utils' @@ -11,59 +11,20 @@ import { useScrollBehavior } from './hooks/useScrollBehavior' export type Message = { parts: MessageFormatPart[], id: number - timestamp?: number + fading?: boolean + faded?: boolean } -const MessageLine = ({ message, currentPlayerName, chatOpened }: { message: Message, currentPlayerName?: string, chatOpened?: boolean }) => { - const [fadeState, setFadeState] = useState<'visible' | 'fading' | 'faded'>('visible') - - useEffect(() => { - if (window.debugStopChatFade) return - // 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 MessageLine = ({ message }: { message: Message }) => { const classes = { - 'chat-message': true, - 'chat-message-fading': !chatOpened && fadeState === 'fading', - 'chat-message-faded': !chatOpened && fadeState === 'faded' + 'chat-message-fadeout': message.fading, + 'chat-message-fade': message.fading, + 'chat-message-faded': message.faded, + 'chat-message': true } - return
  • 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 (typeof msg.text === 'string' && 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 - } - return - }) - } - } - return - })} + return
  • val).map(([name]) => name).join(' ')}> + {message.parts.map((msg, i) => )}
    • } @@ -73,22 +34,29 @@ type Props = { opacity?: number opened?: boolean onClose?: () => void - sendMessage?: (message: string) => Promise | void + sendMessage?: (message: string) => boolean | void fetchCompletionItems?: (triggerKind: 'implicit' | 'explicit', completeValue: string, fullValue: string, abortController?: AbortController) => Promise // width?: number allowSelection?: boolean inputDisabled?: string placeholder?: string - chatVanillaRestrictions?: boolean - debugChatScroll?: boolean - getPingComplete?: (value: string) => Promise - currentPlayerName?: string } 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, @@ -99,23 +67,12 @@ export default ({ usingTouch, allowSelection, inputDisabled, - placeholder, - chatVanillaRestrictions, - debugChatScroll, - getPingComplete, - currentPlayerName + placeholder }: 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 [preservedInputValue, setPreservedInputValue] = useState('') - const [inputKey, setInputKey] = useState(0) - const pingHistoryRef = useRef(JSON.parse(window.localStorage.pingHistory || '[]')) + // const [spellCheckEnabled, setSpellCheckEnabled] = useState(false) + const spellCheckEnabled = false const [completePadText, setCompletePadText] = useState('') const completeRequestValue = useRef('') @@ -125,40 +82,22 @@ export default ({ const chatInput = useRef(null!) const chatMessages = useRef(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) - - useEffect(() => { - if (!debugChatScroll) return - const interval = setInterval(() => { - setRightNowAtBottom(isAtBottom()) - }, 50) - return () => clearInterval(interval) - }, [debugChatScroll]) + const { scrollToBottom } = useScrollBehavior(chatMessages, { messages, opened }) const setSendHistory = (newHistory: string[]) => { 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) => { const base = completeRequestValue.current === '/' ? '' : getCompleteValue() updateInputValue(base + item) - // 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) - } + // 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' })) chatInput.current.focus() } @@ -185,21 +124,6 @@ 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') { @@ -223,7 +147,6 @@ export default ({ updateInputValue(chatInputValueGlobal.value) chatInputValueGlobal.value = '' chatHistoryPos.current = sendHistoryRef.current.length - commandHistoryPos.current = commandHistoryRef.current.length if (!usingTouch) { chatInput.current.focus() } @@ -260,21 +183,10 @@ 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)! - const isCommand = chatInput.current.value.startsWith('/') - - if (lastWord.startsWith('@') && getPingComplete && !isCommand) { - 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?) @@ -290,6 +202,9 @@ export default ({ resetCompletionItems() } completeRequestValue.current = completeValue + // if (completeValue === '/') { + // void fetchCompletions(true) + // } } const fetchCompletions = async (implicit: boolean, inputValue = chatInput.current.value) => { @@ -302,24 +217,6 @@ 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)) @@ -327,11 +224,8 @@ 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)! - if (lastWord.startsWith('@')) { - return item.toLowerCase().includes(lastWord.slice(1).toLowerCase()) - } - return item.includes(lastWord) // return [item, ...compareableParts].some(compareablePart => compareablePart.startsWith(lastWord)) + return item.includes(lastWord) }) setCompletionItems(newCompleteItems) } @@ -340,7 +234,6 @@ 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 @@ -349,140 +242,23 @@ 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 ( <>
    {opacity &&
    - {debugChatScroll && ( -
    -
    -
    -
    -
    -
    - )} {messages.map((m) => ( - + ))}
    || undefined}
    ) })} diff --git a/src/react/ChunksDebugScreen.tsx b/src/react/ChunksDebugScreen.tsx index 28b0bbc4..80e926d8 100644 --- a/src/react/ChunksDebugScreen.tsx +++ b/src/react/ChunksDebugScreen.tsx @@ -2,8 +2,6 @@ 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' @@ -14,10 +12,6 @@ const Inner = () => { const [update, setUpdate] = useState(0) useUtilsEffect(({ interval }) => { - const up = () => { - // setUpdate(u => u + 1) - } - bot.on('chunkColumnLoad', up) interval( 500, () => { @@ -26,48 +20,17 @@ 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, - z, + x: Number(key.split(',')[0]), + z: Number(key.split(',')[1]), state, - lines: [line, line2], + 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}`, ], } @@ -92,22 +55,14 @@ 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 + return { if (!options.debugContro) return null return ( -
    +
    Keys: {[...pressedKeys].join(', ')}
    Actions: {actions.join(', ')}
    diff --git a/src/react/CreateWorld.tsx b/src/react/CreateWorld.tsx index 4cdf186d..32e67ddb 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', 'empty', 'nether', 'all_the_blocks'] +const worldTypes = ['default', 'flat'/* , 'void' */] const gameModes = ['survival', 'creative'/* , 'adventure', 'spectator' */] export const creatingWorldState = proxy({ diff --git a/src/react/CreateWorldProvider.tsx b/src/react/CreateWorldProvider.tsx index 619a31f5..6872474d 100644 --- a/src/react/CreateWorldProvider.tsx +++ b/src/react/CreateWorldProvider.tsx @@ -32,14 +32,30 @@ 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: { - name: type - }, + generation, 'worldFolder': savePath, gameMode: gameMode === 'survival' ? 0 : 1, }, diff --git a/src/react/CreditsAboutModal.module.css b/src/react/CreditsAboutModal.module.css deleted file mode 100644 index 753d0448..00000000 --- a/src/react/CreditsAboutModal.module.css +++ /dev/null @@ -1,84 +0,0 @@ -.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 deleted file mode 100644 index 30ac3261..00000000 --- a/src/react/CreditsAboutModal.module.css.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -// 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 deleted file mode 100644 index 24826cd3..00000000 --- a/src/react/CreditsAboutModal.tsx +++ /dev/null @@ -1,57 +0,0 @@ -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 ( - -
    -

    Minecraft Open Source JS Edition

    - -
    - What if Minecraft was an online game? -

    - 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: -

    -
      -
    • - Everyone who provided awesome mods for the game
      • -
    • - [Gen] for rewriting the physics engine to be Grim-compliant
      • -
    • - [ViaVersion] for providing reliable sound id mappings
      • -
    • - [Bluemap] for providing block entity models like chest
      • -
    • - [Deepslate] for rendering 3d blocks in GUI (inventory)
      • -
    • - [skinview3d] for rendering skins & player geometry
      • -
    • - [Polymer] (c++ project) for providing fast & accurate server light implementation
      • -
    - -

    Current contributors:

    -
      -
    • - Maxim Grigorev - React UI & Core Developer Maintainer
      • -
    • - And many more community contributors!
      • -
    - - -
    -
    -     - ) -} diff --git a/src/react/CreditsBookButton.module.css b/src/react/CreditsBookButton.module.css deleted file mode 100644 index 83af5d80..00000000 --- a/src/react/CreditsBookButton.module.css +++ /dev/null @@ -1,27 +0,0 @@ -.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 deleted file mode 100644 index 72f94435..00000000 --- a/src/react/CreditsBookButton.module.css.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -// 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 deleted file mode 100644 index a3be740f..00000000 --- a/src/react/CreditsBookButton.tsx +++ /dev/null @@ -1,22 +0,0 @@ -import { showModal } from '../globalState' -import styles from './CreditsBookButton.module.css' - -export default () => { - const handleClick = () => { - showModal({ reactType: 'credits-about' }) - } - - return ( - - ) -} diff --git a/src/react/DeathScreen.tsx b/src/react/DeathScreen.tsx index 3501368f..8f4c3f00 100644 --- a/src/react/DeathScreen.tsx +++ b/src/react/DeathScreen.tsx @@ -24,7 +24,7 @@ export default ({ dieReasonMessage, respawnCallback, disconnectCallback }: Props }} />
    - + {currentTouch && ( +
    +
    + )} {items.map((element, i) => { // make sure its unique! return diff --git a/src/react/OverlayModelViewer.tsx b/src/react/OverlayModelViewer.tsx deleted file mode 100644 index e48a2f0b..00000000 --- a/src/react/OverlayModelViewer.tsx +++ /dev/null @@ -1,554 +0,0 @@ -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' -import { activeModalStack } from '../globalState' - -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 - alwaysRender?: 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 - } - } -} - -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(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>(new Map()) - const modelLoaders = useRef>(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 and enable shadows - const customization = model?.modelCustomization?.[modelUrl] - 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)) - } - 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) - - // 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 - 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 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 - - 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 - }) - - // 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()) - 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 ( -
    -
    -
    -
    -
    - ) -} diff --git a/src/react/PauseScreen.tsx b/src/react/PauseScreen.tsx index 856ac932..22e00ded 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, lastConnectOptions, reconnectReload } from './AppStatusProvider' +import { appStatusState, reconnectReload } from './AppStatusProvider' import NetworkStatus from './NetworkStatus' import PauseLinkButtons from './PauseLinkButtons' import { pixelartIcons } from './PixelartIcon' @@ -163,7 +163,6 @@ 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) { @@ -265,7 +264,7 @@ export default () => {
    - + {singleplayer ? (
    ) : null} - {(noConnection || appConfig?.alwaysReconnectButton) && ( -
    - - {appConfig?.reportBugButtonWithReconnect && ( -
    - )} {!lockConnect && <> } + {noConnection && ( + + )}
    diff --git a/src/react/PlayerListOverlay.stories.tsx b/src/react/PlayerListOverlay.stories.tsx index 2b82938d..ec1958a7 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', diff --git a/src/react/PlayerListOverlay.tsx b/src/react/PlayerListOverlay.tsx index 0aa99136..90dfd685 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>> +type PlayersLists = Array>> type PlayerListOverlayProps = { playersLists: PlayersLists, @@ -25,7 +25,7 @@ export default ({ playersLists, clientId, tablistHeader, tablistFooter, serverIP
    {list.map(player => (
    - +

    {player.ping}

    ms

    diff --git a/src/react/PlayerListOverlayProvider.tsx b/src/react/PlayerListOverlayProvider.tsx index 4d8a8ed7..2f2cac54 100644 --- a/src/react/PlayerListOverlayProvider.tsx +++ b/src/react/PlayerListOverlayProvider.tsx @@ -1,26 +1,34 @@ -import { proxy, useSnapshot } from 'valtio' +import { useSnapshot } from 'valtio' import { useState, useEffect, useMemo } from 'react' import { isGameActive } from '../globalState' 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 -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 [clientId, setClientId] = useState('') const [players, setPlayers] = useState({}) - const [counter, setCounter] = useState(0) + const [isOpen, setIsOpen] = useState(false) + + 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 () { @@ -43,38 +51,34 @@ export default () => { setClientId(bot.player.uuid) } else { bot._client.on('player_info', () => { - if (bot.player?.uuid) { - setClientId(bot.player?.uuid) - } + setClientId(bot.player?.uuid) }) } - const playerlistHeader = () => setCounter(prev => prev + 1) - bot._client.on('playerlist_header', playerlistHeader) + document.addEventListener('keydown', handleKeyDown) + document.addEventListener('keyup', handleKeyUp) return () => { - bot?._client.removeListener('playerlist_header', playerlistHeader) + document.removeEventListener('keydown', handleKeyDown) + document.removeEventListener('keyup', handleKeyUp) } }, [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 - 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)) + 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 = [] } } diff --git a/src/react/RendererDebugMenu.tsx b/src/react/RendererDebugMenu.tsx deleted file mode 100644 index f4bf7876..00000000 --- a/src/react/RendererDebugMenu.tsx +++ /dev/null @@ -1,119 +0,0 @@ -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 | undefined - return worldRenderer ? : null -} - -const RendererDebugMenu = ({ worldRenderer }: { worldRenderer: 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
    -
    -

    Rendering Controls

    -
    - -
    -

    Chunks Render Settings

    -
    -
    - -
    -
    - - {/*
    -
    */} -
    -
    -} diff --git a/src/react/Scoreboard.css b/src/react/Scoreboard.css index 38ec426f..b2bb8521 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; diff --git a/src/react/Screen.tsx b/src/react/Screen.tsx index 66e7b8d8..605ec28f 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' ?
    : backdrop ?
    : null} -
    +
    {title}
    {children} diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx index 42ef2aaa..cd44a27a 100644 --- a/src/react/ServersListProvider.tsx +++ b/src/react/ServersListProvider.tsx @@ -1,11 +1,9 @@ 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 appSupportedVersions from '../supportedVersions.mjs' +import supportedVersions from '../supportedVersions.mjs' import { appQueryParams } from '../appParams' import { fetchServerStatus, isServerValid } from '../api/mcStatusApi' import { getServerInfo } from '../mineflayer/mc-protocol' @@ -16,16 +14,12 @@ import { useDidUpdateEffect } from './utils' import { useIsModalActive } from './utilsApp' import { showOptionsModal } from './SelectOption' import { useCopyKeybinding } from './simpleHooks' -import { AuthenticatedAccount, setNewServersList } from './serversStorage' +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 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) { @@ -51,17 +45,10 @@ 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) - useEffect(() => { - if (!hidden) { - setRetriggerFocusCounter(x => x + 1) - } - }, [hidden]) + const { serversList: savedServersList } = useSnapshot(appStorage) - const _savedServersListWatchOnly = useSnapshot(appStorage).serversList - - const serversListProvided = useMemo(() => { + const serversListDisplay = useMemo(() => { return ( customServersList ? customServersList.map((row): StoreServerItem => { @@ -73,9 +60,9 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL name, } }) - : [...(appStorage.serversList?.filter(server => server) ?? [])] + : [...getInitialServersList()] ) - }, [customServersList, _savedServersListWatchOnly]) + }, [customServersList, savedServersList]) const [additionalServerData, setAdditionalServerData] = useState>({}) @@ -91,20 +78,14 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL const newIndex = e.key === 'ArrowUp' ? Math.max(0, selectedIndex - 1) - : Math.min(serversListProvided.length - 1, selectedIndex + 1) + : Math.min(serversListDisplay.length - 1, selectedIndex + 1) if (newIndex === selectedIndex) return - if (newIndex < 0 || newIndex >= serversListProvided.length) return // Move server in the list - const newList = [...serversListProvided] + const newList = [...serversListDisplay] const oldItem = newList[selectedIndex] - const newItem = newList[newIndex] - if (oldItem.isRecommended || newItem.isRecommended) { - return - } - - newList[selectedIndex] = newItem + newList[selectedIndex] = newList[newIndex] newList[newIndex] = oldItem appStorage.serversList = newList @@ -113,18 +94,9 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL document.addEventListener('keydown', handleKeyDown) return () => document.removeEventListener('keydown', handleKeyDown) - }, [selectedIndex, serversListProvided]) + }, [selectedIndex, serversListDisplay]) - const serversListSorted: Array = useMemo(() => [ - ...serversListProvided, - ...(customServersList ? [] : (miscUiState.appConfig?.promoteServers ?? [])).map((server): StoreServerItem => ({ - ip: server.ip, - name: server.name, - versionOverride: server.version, - description: server.description, - isRecommended: true - })) - ].map((server, index) => ({ ...server, index })), [serversListProvided]) + 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)) @@ -163,23 +135,13 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL const isWebSocket = server.ip.startsWith('ws://') || server.ip.startsWith('wss://') let data if (isWebSocket) { - try { - const pingResult = await getServerInfo(server.ip, undefined, undefined, true) - 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 - } - } catch (err) { - data = { - formattedText: 'Failed to connect', - textNameRight: '', - textNameRightGrayed: '', - offline: true - } + 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 } } else { data = await fetchServerStatus(server.ip, /* signal */undefined, server.versionOverride) // DONT ADD SIGNAL IT WILL CRUSH JS RUNTIME @@ -224,7 +186,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL }, [isEditScreenModal]) useCopyKeybinding(() => { - const item = serversListProvided[selectedIndex] + const item = serversListDisplay[selectedIndex] if (!item) return let str = `${item.ip}` if (item.versionOverride) { @@ -234,6 +196,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL }) const editModalJsx = isEditScreenModal ? : null const serversListJsx = s.usernameOverride)?.usernameOverride + const lastJoinedUsername = serversListSorted.find(s => s.usernameOverride)?.usernameOverride let username = overrides.usernameOverride || getCurrentUsername() || '' if (!username) { const promptUsername = prompt('Enter username', lastJoinedUsername || '') @@ -324,10 +287,11 @@ 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 () { - if (shouldSave !== false && !serversListProvided.some(s => s.ip === ip)) { + if (shouldSave && !serversListDisplay.some(s => s.ip === ip)) { const newServersList: StoreServerItem[] = [ { ip, @@ -335,7 +299,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL versionOverride: overrides.versionOverride, numConnects: 1 }, - ...serversListProvided + ...serversListDisplay ] setNewServersList(newServersList) miscUiState.loadedServerIndex = (newServersList.length - 1).toString() @@ -343,10 +307,10 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL if (shouldSave === undefined) { // loading saved // find and update - const server = serversListProvided.find(s => s.ip === ip) + const server = serversListDisplay.find(s => s.ip === ip) if (server) { // move to top - const newList = [...serversListProvided] + const newList = [...serversListDisplay] const index = newList.indexOf(server) const thisItem = newList[index] newList.splice(index, 1) @@ -358,7 +322,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL } } }, - serverIndex: shouldSave ? serversListProvided.length.toString() : indexOrIp // assume last + serverIndex: shouldSave ? serversListDisplay.length.toString() : indexOrIp // assume last } satisfies ConnectOptions dispatchEvent(new CustomEvent('connect', { detail: options })) // qsOptions @@ -371,7 +335,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL appStorage.authenticatedAccounts = authenticatedAccounts.filter(a => a.username !== username) }} onWorldAction={(action, index) => { - const server = serversListProvided[index] + const server = serversListDisplay[index] if (!server) return if (action === 'edit') { @@ -423,7 +387,6 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL offline: additional?.offline, afterTitleUi: ( +
    + + {hintText}
    ) } diff --git a/src/react/appStorageProvider.ts b/src/react/appStorageProvider.ts index fd469186..5cef34c1 100644 --- a/src/react/appStorageProvider.ts +++ b/src/react/appStorageProvider.ts @@ -1,16 +1,13 @@ 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' // 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 = process.env.COOKIE_STORAGE_PREFIX || '' const { localStorage } = window -const migrateRemoveLocalStorage = false export interface SavedProxiesData { proxies: string[] @@ -30,22 +27,14 @@ export interface StoreServerItem extends BaseServerInfo { optionsOverride?: Record autoLogin?: Record numConnects?: number // Track number of connections - isRecommended?: boolean -} - -interface StorageConflict { - key: string - localStorageValue: any - localStorageTimestamp?: number - cookieValue: any - cookieTimestamp?: number } type StorageData = { - cookieStorage: boolean | { ignoreKeys: Array } customCommands: Record | undefined username: string | undefined keybindings: UserOverridesConfig | undefined + /** @deprecated */ + options: any changedSettings: any proxiesData: SavedProxiesData | undefined serversHistory: ServerHistoryEntry[] @@ -55,130 +44,10 @@ type StorageData = { firstModsPageVisit: boolean } -const cookieStoreKeys: Array = [ - 'customCommands', - 'username', - 'keybindings', - 'changedSettings', - 'serversList', -] - const oldKeysAliases: Partial> = { 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 - - // 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) - 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 (localStorage.getItem(`${localStorageKey}: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 - - 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, - localStorageTimestamp: localTimestamp, - cookieValue: (typeof cookieData === 'object' && cookieData !== null && 'data' in cookieData) ? cookieData.data : 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') @@ -204,10 +73,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: [], @@ -217,164 +86,35 @@ const defaultStorageData: StorageData = { firstModsPageVisit: true, } -export const setStorageDataOnAppConfigLoad = (appConfig: AppConfig) => { - appStorage.username ??= getRandomUsername(appConfig) -} - -export const getRandomUsername = (appConfig: AppConfig) => { - 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 setStorageDataOnAppConfigLoad = () => { + appStorage.username ??= `mcrafter${Math.floor(Math.random() * 1000)}` } 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 = () => { - // 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') - } - 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 +// 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) } } - - 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 - } - - localStorage.setItem(`${localStorageKey}:migrated`, 'true') } const saveKey = (key: keyof StorageData) => { - const useCookieStorage = shouldUseCookieStorage() const prefixedKey = `${localStoragePrefix}${key}` const value = appStorage[key] - - 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 { - // 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 - } - } - } - - if (useLocalStorage) { - // Save to localStorage - if (value === undefined) { - localStorage.removeItem(prefixedKey) - } else { - localStorage.setItem(prefixedKey, JSON.stringify(value)) - } + if (value === undefined) { + localStorage.removeItem(prefixedKey) + } else { + localStorage.setItem(prefixedKey, JSON.stringify(value)) } } @@ -385,6 +125,7 @@ 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)) { @@ -396,44 +137,6 @@ 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) - } - } - - // 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() -} - -export const getStorageConflicts = () => storageConflicts - migrateLegacyData() - -// Restore data after checking for conflicts -restoreStorageData() diff --git a/src/react/button.module.css b/src/react/button.module.css index e940c224..ae32ee5f 100644 --- a/src/react/button.module.css +++ b/src/react/button.module.css @@ -3,8 +3,7 @@ --txrV: 66px; position: relative; width: 200px; - min-height: calc(20px * var(--scale)); - max-height: calc(20px * var(--scale)); + height: calc(20px * var(--scale)); font-family: minecraft, mojangles, monospace; font-size: 10px; color: white; diff --git a/src/react/debugs/DebugResponseTimeIndicator.module.css b/src/react/debugs/DebugResponseTimeIndicator.module.css deleted file mode 100644 index 65196a29..00000000 --- a/src/react/debugs/DebugResponseTimeIndicator.module.css +++ /dev/null @@ -1,10 +0,0 @@ -.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 deleted file mode 100644 index b79d5d59..00000000 --- a/src/react/debugs/DebugResponseTimeIndicator.module.css.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -// 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 deleted file mode 100644 index b6b3fdcd..00000000 --- a/src/react/debugs/DebugResponseTimeIndicator.tsx +++ /dev/null @@ -1,32 +0,0 @@ -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 ? ( -
    - ) : null -} diff --git a/src/react/hooks/useScrollBehavior.ts b/src/react/hooks/useScrollBehavior.ts index 5a839066..3b9499a6 100644 --- a/src/react/hooks/useScrollBehavior.ts +++ b/src/react/hooks/useScrollBehavior.ts @@ -1,4 +1,4 @@ -import { RefObject, useEffect, useLayoutEffect, useRef, useState } from 'react' +import { RefObject, useEffect, useLayoutEffect, useRef } from 'react' import { pixelartIcons } from '../PixelartIcon' export const useScrollBehavior = ( @@ -12,8 +12,6 @@ export const useScrollBehavior = ( } ) => { const openedWasAtBottom = useRef(true) // before new messages - const [currentlyAtBottom, setCurrentlyAtBottom] = useState(true) - const scrollTimeoutRef = useRef(null) const isAtBottom = () => { if (!elementRef.current) return true @@ -22,30 +20,17 @@ export const useScrollBehavior = ( return distanceFromBottom < 1 } - const scrollToBottom = (behavior: ScrollBehavior = 'instant') => { - if (!elementRef.current) return - - // Clear any existing scroll timeout - if (scrollTimeoutRef.current) { - clearTimeout(scrollTimeoutRef.current) + 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 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 @@ -54,28 +39,18 @@ export const useScrollBehavior = ( if (!element) return const handleScroll = () => { - const atBottom = isAtBottom() - openedWasAtBottom.current = atBottom - setCurrentlyAtBottom(atBottom) + openedWasAtBottom.current = isAtBottom() } element.addEventListener('scroll', handleScroll) - return () => { - element.removeEventListener('scroll', handleScroll) - if (scrollTimeoutRef.current) { - clearTimeout(scrollTimeoutRef.current) - } - } + return () => element.removeEventListener('scroll', handleScroll) }, []) // Handle opened state changes useLayoutEffect(() => { if (opened) { - // Wait a frame before scrolling to ensure DOM has updated - requestAnimationFrame(() => { - scrollToBottom() - }) - } else if (elementRef.current) { + openedWasAtBottom.current = true + } else { scrollToBottom() } }, [opened]) @@ -89,8 +64,6 @@ export const useScrollBehavior = ( return { scrollToBottom, - isAtBottom, - wasAtBottom: () => openedWasAtBottom.current, - currentlyAtBottom + isAtBottom } } diff --git a/src/react/mods.module.css b/src/react/mods.module.css index 00b586f0..2b3184bb 100644 --- a/src/react/mods.module.css +++ b/src/react/mods.module.css @@ -1,5 +1,4 @@ .root { - min-height: 0; display: flex; flex-direction: column; height: 100%; @@ -32,8 +31,7 @@ } .content { - display: grid; - grid-template-columns: 60% 40%; + display: flex; flex: 1; gap: 10px; overflow: hidden; @@ -41,24 +39,21 @@ } .verticalContent { - display: grid; - grid-template-columns: none; - grid-template-rows: 60% 40%; - overflow: hidden; + flex-direction: column; } .verticalContent .modList { - max-height: 100%; - overflow-y: auto; + height: 50%; + min-height: 200px; } .verticalContent .sidebar { - max-height: 100%; + height: 50%; width: 100%; - overflow-y: auto; } .modList { + flex: 1; overflow-y: auto; display: flex; flex-direction: column; @@ -68,19 +63,18 @@ padding: 5px; min-height: 0; /* Important for Firefox */ height: 100%; - width: 100%; } .sidebar { - overflow-y: auto; - width: 100%; - height: 100%; + 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 { diff --git a/src/react/rendererDebugMenu.module.css b/src/react/rendererDebugMenu.module.css deleted file mode 100644 index 6c49e04c..00000000 --- a/src/react/rendererDebugMenu.module.css +++ /dev/null @@ -1,34 +0,0 @@ -.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 deleted file mode 100644 index 0f8f2163..00000000 --- a/src/react/rendererDebugMenu.module.css.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -// 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/react/serversStorage.ts b/src/react/serversStorage.ts index da7569cc..b320e2f3 100644 --- a/src/react/serversStorage.ts +++ b/src/react/serversStorage.ts @@ -1,7 +1,6 @@ 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 @@ -44,34 +43,9 @@ export function updateServerConnectionHistory (ip: string, version?: string) { } } -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 - } + if (index === undefined) index = miscUiState.loadedServerIndex + if (index === undefined) return const servers = [...(appStorage.serversList ?? [])] const server = servers[index] @@ -85,6 +59,26 @@ 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) diff --git a/src/reactUi.tsx b/src/reactUi.tsx index 6339686e..72aff0ef 100644 --- a/src/reactUi.tsx +++ b/src/reactUi.tsx @@ -60,15 +60,6 @@ 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' -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' -import FireRenderer from './react/FireRenderer' -import MonacoEditor from './react/MonacoEditor' -import OverlayModelViewer from './react/OverlayModelViewer' const isFirefox = ua.getBrowser().name === 'Firefox' if (isFirefox) { @@ -167,24 +158,20 @@ const InGameUi = () => { {showMinimap !== 'never' && } {!disabledUiParts.includes('title') && } {!disabledUiParts.includes('scoreboard') && } - + {!disabledUiParts.includes('effects-indicators') && } {!disabledUiParts.includes('crosshair') && } {!disabledUiParts.includes('books') && } {!disabledUiParts.includes('bossbars') && displayBossBars && } - - {!disabledUiParts.includes('fire') && }
    - {showUI && } -
    {!disabledUiParts.includes('xp-bar') && } {!disabledUiParts.includes('hud-bars') && } @@ -233,7 +220,6 @@ const App = () => {
    - @@ -250,8 +236,9 @@ const App = () => { + - + @@ -260,9 +247,6 @@ const App = () => {
    - - -
    @@ -283,17 +267,13 @@ const PerComponentErrorBoundary = ({ children }) => { ) } -if (!new URLSearchParams(window.location.search).get('no-ui')) { - renderToDom(, { - strictMode: false, - selector: '#react-root', - }) -} +renderToDom(, { + 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 diff --git a/src/rendererUtils.ts b/src/rendererUtils.ts index 0a49fc78..49a77801 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 (!playerState.ready) return + if (!bot) return // Calculate base FOV modifier let fovModifier = 1 @@ -39,10 +39,10 @@ const updateFovAnimation = () => { } // Item usage modifier - if (playerState.reactive.heldItemMain) { - const heldItem = playerState.reactive.heldItemMain - if (heldItem?.name === 'bow' && playerState.reactive.itemUsageTicks > 0) { - const ticksUsingItem = playerState.reactive.itemUsageTicks + 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 @@ -88,4 +88,8 @@ 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 ea6c73fd..7c348cb2 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', false) + await removeFileRecursiveAsync('/resourcepack') gameAdditionalState.usingServerResourcePack = false } const basePath = resourcepackPackBasePath + name @@ -212,6 +212,7 @@ 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 let path @@ -419,7 +420,6 @@ 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,10 +439,8 @@ 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') @@ -477,7 +475,6 @@ 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') @@ -486,6 +483,17 @@ const downloadAndUseResourcePack = async (url: string, progressReporter: Progres } } +const waitForGameEvent = async () => { + if (miscUiState.gameLoaded) return + await new Promise(resolve => { + const listener = () => resolve() + customEvents.once('gameLoaded', listener) + watchUnloadForCleanup(() => { + customEvents.removeListener('gameLoaded', listener) + }) + }) +} + export const onAppLoad = () => { customEvents.on('mineflayerBotCreated', () => { // todo also handle resourcePack @@ -505,19 +513,21 @@ export const onAppLoad = () => { cancel: !forced, minecraftJsonMessage: promptMessagePacket, }) - if (Date.now() - start < 700) { - void new Promise(resolve => { - // wait for state protocol switch + if (Date.now() - start < 700) { // wait for state protocol switch + await new Promise(resolve => { 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) @@ -580,17 +590,10 @@ 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) ?? {} - 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() - ]) + 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() resources.customTextures = {} if (blocksData) { diff --git a/src/resourcesManager.ts b/src/resourcesManager.ts index ef3dd7ce..4ee91ab4 100644 --- a/src/resourcesManager.ts +++ b/src/resourcesManager.ts @@ -8,25 +8,26 @@ 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, ItemsAtlasesOutputJson } from 'mc-assets/dist/atlasParser' +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' type ResourceManagerEvents = { assetsTexturesUpdated: () => void - assetsInventoryStarted: () => void assetsInventoryReady: () => void } -export class LoadedResourcesTransferrable { - allReady = false +export class LoadedResources { // Atlas parsers - itemsAtlasImage: ImageBitmap - blocksAtlasImage: ImageBitmap - blocksAtlasJson: ItemsAtlasesOutputJson + itemsAtlasParser: AtlasParser + blocksAtlasParser: AtlasParser + itemsAtlasImage: HTMLImageElement + blocksAtlasImage: HTMLImageElement // User data (specific to current resourcepack/version) customBlockStates?: Record customModels?: Record @@ -37,11 +38,9 @@ export class LoadedResourcesTransferrable { blocks?: { tileSize: number | undefined, textures: Record } armor?: { tileSize: number | undefined, textures: Record } } = {} - guiAtlas: { json: any, image: ImageBitmap } | null = null - guiAtlasVersion = 0 itemsRenderer: ItemsRenderer - worldBlockProvider?: WorldBlockProvider + worldBlockProvider: WorldBlockProvider blockstatesModels: any = null version: string @@ -60,17 +59,8 @@ export interface UpdateAssetsRequest { _?: false } -export interface ResourcesManagerTransferred extends TypedEmitter { - currentResources: LoadedResourcesTransferrable -} -export interface ResourcesManagerCommon extends TypedEmitter { - currentResources: LoadedResourcesTransferrable | undefined -} - const STABLE_MODELS_VERSION = '1.21.4' export class ResourcesManager extends (EventEmitter as new () => TypedEmitter) { - static restorerName = 'ResourcesManager' - // Source data (imported, not changing) sourceBlockStatesModels: any = null readonly sourceBlocksAtlases: any = blocksAtlases @@ -78,9 +68,7 @@ export class ResourcesManager extends (EventEmitter as new () => TypedEmitter() @@ -88,12 +76,17 @@ export class ResourcesManager extends (EventEmitter as new () => TypedEmitter TypedEmitter TypedEmitter { + 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) { resources.itemsRenderer = new ItemsRenderer( resources.version, resources.blockstatesModels, - this.itemsAtlasParser, - this.blocksAtlasParser + resources.itemsAtlasParser, + resources.blocksAtlasParser ) } if (abortController.signal.aborted) return this.currentResources = resources - resources.allReady = true if (!unstableSkipEvent) { // todo rework resourcepack optimization this.emit('assetsTexturesUpdated') } @@ -151,7 +157,6 @@ export class ResourcesManager extends (EventEmitter as new () => TypedEmitter { if (abortController.signal.aborted) return if (!unstableSkipEvent) { @@ -162,7 +167,7 @@ export class ResourcesManager extends (EventEmitter as new () => TypedEmitter const date = new Date() if ((date.getMonth() === 11 && date.getDate() >= 24) || (date.getMonth() === 0 && date.getDate() <= 6)) { @@ -189,36 +194,16 @@ export class ResourcesManager extends (EventEmitter as new () => TypedEmitter { - 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() } @@ -226,7 +211,7 @@ export class ResourcesManager extends (EventEmitter as new () => TypedEmitter { } } -let dataStatus = 'not-called' - const optimizedDataResolver = customResolver() window._MC_DATA_RESOLVER = optimizedDataResolver window._LOAD_MC_DATA = async () => { if (optimizedDataResolver.resolvedData) return - dataStatus = 'loading' - try { - optimizedDataResolver.resolve(await importLargeData('mcData')) - dataStatus = 'ready' - } catch (e) { - dataStatus = 'error' - throw e - } + optimizedDataResolver.resolve(await importLargeData('mcData')) } // 30 seconds @@ -48,7 +39,7 @@ const possiblyGetFromCache = (version: string) => { } const inner = () => { if (!optimizedDataResolver.resolvedData) { - throw new Error(`Minecraft data are not ready yet. Ensure you await window._LOAD_MC_DATA() before using it. Status: ${dataStatus}`) + throw new Error(`Data for ${version} is not ready yet`) } const dataTypes = Object.keys(optimizedDataResolver.resolvedData) const allRestored = {} diff --git a/src/sounds/botSoundSystem.ts b/src/sounds/botSoundSystem.ts index cb237072..3234652b 100644 --- a/src/sounds/botSoundSystem.ts +++ b/src/sounds/botSoundSystem.ts @@ -11,7 +11,6 @@ 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 @@ -51,9 +50,8 @@ subscribeKey(miscUiState, 'gameLoaded', async () => { appViewer.backend?.soundSystem?.playSound( position, soundData.url, - soundData.volume, - Math.max(Math.min(pitch ?? 1, 2), 0.5), - soundData.timeout ?? options.remoteSoundsLoadTimeout + soundData.volume * (options.volume / 100), + Math.max(Math.min(pitch ?? 1, 2), 0.5) ) } if (getDistance(bot.entity.position, position) < 4 * 16) { @@ -73,7 +71,7 @@ subscribeKey(miscUiState, 'gameLoaded', async () => { } const musicStartCheck = async (force = false) => { - if (!soundMap || !bot) return + if (!soundMap) return // 20% chance to start music if (Math.random() > 0.2 && !force && !options.enableMusic) return @@ -83,7 +81,7 @@ subscribeKey(miscUiState, 'gameLoaded', async () => { } const randomMusicKey = musicKeys[Math.floor(Math.random() * musicKeys.length)] const soundData = await soundMap.getSoundUrl(randomMusicKey) - if (!soundData || !soundMap) return + if (!soundData) return await musicSystem.playMusic(soundData.url, soundData.volume) } @@ -111,19 +109,14 @@ 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) }) 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 - (hasNamedSoundEffect ? 0 : 1)] + const soundKey = soundMap!.soundsIdToName[packet.soundId - 1] if (soundKey === undefined) return await playGeneralSound(soundKey, pos, packet.volume, packet.pitch) return @@ -141,7 +134,6 @@ 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 diff --git a/src/sounds/customSoundSystem.ts b/src/sounds/customSoundSystem.ts deleted file mode 100644 index 1880aa70..00000000 --- a/src/sounds/customSoundSystem.ts +++ /dev/null @@ -1,46 +0,0 @@ -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 } - - // 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/musicSystem.ts b/src/sounds/musicSystem.ts index 8fad4c74..ecabf43e 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 || options.musicVolume === 0) return + if (!options.enableMusic || this.currentMusic) return try { - const { onEnded } = await loadOrPlaySound(url, musicVolume, 5000, undefined, true) ?? {} + const { onEnded } = await loadOrPlaySound(url, 0.5 * musicVolume, 5000) ?? {} if (!onEnded) return diff --git a/src/sounds/soundsMap.ts b/src/sounds/soundsMap.ts index 47028971..1b0a0178 100644 --- a/src/sounds/soundsMap.ts +++ b/src/sounds/soundsMap.ts @@ -35,7 +35,6 @@ interface ResourcePackSoundEntry { name: string stream?: boolean volume?: number - timeout?: number } interface ResourcePackSound { @@ -141,7 +140,7 @@ export class SoundMap { await scan(soundsBasePath) } - async getSoundUrl (soundKey: string, volume = 1): Promise<{ url: string; volume: number, timeout?: number } | undefined> { + 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] @@ -152,13 +151,6 @@ 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/utils.ts b/src/utils.ts index 3ccc7fc4..93e2eb7b 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -1,6 +1,5 @@ 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,14 +38,13 @@ export const pointerLock = { if (options.autoFullScreen) { void goFullscreen() } - 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 + 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 (!(document.fullscreenElement && navigator['keyboard']) && this.justHitEscape) { - displayMouseCaptureFailure() + displayBrowserProblem() } else { //@ts-expect-error const promise: any = document.documentElement.requestPointerLock({ @@ -58,10 +56,9 @@ export const pointerLock = { document.documentElement.requestPointerLock() } else if (error.name === 'SecurityError') { // cause: https://discourse.threejs.org/t/how-to-avoid-pointerlockcontrols-error/33017/4 - displayMouseCaptureFailure() + displayBrowserProblem() } else { - displayMouseCaptureFailure() - console.warn('Failed to request pointer lock:', error) + console.error(error) } }) } @@ -163,7 +160,7 @@ export const reloadChunks = async () => { } export const openGithub = (addUrl = '') => { - window.open(`${process.env.GITHUB_URL?.replace(/\/$/, '')}${addUrl}`, '_blank') + window.open(`${process.env.GITHUB_URL}${addUrl}`, '_blank') } export const resolveTimeout = async (promise, timeout = 10_000) => { diff --git a/src/utils/splashText.ts b/src/utils/splashText.ts deleted file mode 100644 index 4052c4f4..00000000 --- a/src/utils/splashText.ts +++ /dev/null @@ -1,67 +0,0 @@ -const MAX_WORDS = 5 -const HTTPS_REGEX = /^https?:\/\// -const TIMEOUT_MS = 5000 -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 text - } - return words.slice(0, MAX_WORDS).join(' ') + '...' -} - -export const isRemoteSplashText = (text: string): boolean => { - if (!text) return false - return HTTPS_REGEX.test(text) -} - -export const loadRemoteSplashText = async (url: string): Promise => { - try { - 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}`) - } - - const clonedResponse = response.clone() - 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 clonedResponse.text() - return limitWords(text.trim()) - } - } catch (error) { - console.error('Error loading remote splash text:', error) - return 'Failed to load splash text!' - } -} - -export const cacheSourceUrl = (url: string): void => { - localStorage.setItem(SPLASH_URL_KEY, url) -} - -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) -} diff --git a/src/watchOptions.ts b/src/watchOptions.ts index de7d30d3..9fe55289 100644 --- a/src/watchOptions.ts +++ b/src/watchOptions.ts @@ -3,7 +3,6 @@ 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' @@ -81,16 +80,6 @@ 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 - appViewer.inWorldRenderingConfig.enableDebugOverlay = o.rendererPerfDebugOverlay - }) - watchValue(options, (o, isChanged) => { appViewer.inWorldRenderingConfig.clipWorldBelowY = o.clipWorldBelowY appViewer.inWorldRenderingConfig.extraBlockRenderers = !o.disableSignsMapsSupport @@ -98,8 +87,6 @@ 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 @@ -119,10 +106,6 @@ export const watchOptionsAfterViewerInit = () => { appViewer.inWorldRenderingConfig.starfield = o.starfieldRendering }) - watchValue(options, o => { - appViewer.inWorldRenderingConfig.defaultSkybox = o.defaultSkybox - }) - watchValue(options, o => { // appViewer.inWorldRenderingConfig.neighborChunkUpdates = o.neighborChunkUpdates }) @@ -135,6 +118,5 @@ 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 }) } diff --git a/vitest.config.ts b/vitest.config.ts index 7da46199..1d1588e4 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -7,7 +7,6 @@ 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'