Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
c755f08
fix: update rsbuild and pnpm to latest version to resolve long-standi…
zardoy Apr 10, 2025
024da5b
fix: now media dont receive global lighting by default
zardoy Apr 10, 2025
deb8ec6
build sharp to avoid crashes
zardoy Apr 10, 2025
77449c5
forgot to fix what codereabbit told to fix
zardoy Apr 10, 2025
27df313
microoptimisation on big number of chunks load
zardoy Apr 11, 2025
4b85b16
feat(experimental-part1): rework chunk loading strategy by forcing sp…
zardoy Apr 11, 2025
7e5a129
fix: fix looking camera desync in local saves
zardoy Apr 11, 2025
70557a6
fix dockerfile
zardoy Apr 11, 2025
83502eb
fix(important): Formatted text display: fix reading extra when its te…
zardoy Apr 12, 2025
7a53d4d
fix(feedback-controls): prevent default action for side mouse buttons…
zardoy Apr 14, 2025
c5e8fcb
feat: add controls debug interface! Debug happening actions in your g…
zardoy Apr 14, 2025
a541e82
fix: add freezeSettings param
zardoy Apr 14, 2025
6a8de1f
fix: sometimes auto login suggestion was not visible due to overlappi…
zardoy Apr 16, 2025
f5ed17d
fix(critical-regression): FIX broken inventory! There was a huge regr…
zardoy Apr 16, 2025
143d4a3
fix: fix double chests. fix inventory crashing when it doesnt know th…
zardoy Apr 16, 2025
73ccb48
feat: Add F3+H chunks debug screen! not really useful for now since c…
zardoy Apr 16, 2025
e8b1f19
add more debug into to f3+h
zardoy Apr 17, 2025
1582e16
fix critical regression that led to not loading chunks twice that was…
zardoy Apr 17, 2025
529b465
sync for changes between forks
zardoy Apr 17, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ jobs:
(
github.event_name == 'issue_comment' &&
github.event.issue.pull_request != '' &&
contains(github.event.comment.body, '/benchmark')
(startsWith(github.event.comment.body, '/benchmark'))
)
permissions:
pull-requests: write
steps:
- run: lscpu

- name: Checkout
uses: actions/checkout@v2
# with:
# ref: refs/pull/${{ github.event.issue.number }}/head
- run: npm i -g [email protected]
- name: Setup pnpm
uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
node-version: 18
Expand All @@ -33,8 +33,10 @@ jobs:
jq '.dependencies.cypress = .optionalDependencies.cypress | del(.optionalDependencies.cypress)' package.json > package.json.tmp
mv package.json.tmp package.json
- run: pnpm install --no-frozen-lockfile

- run: pnpm build
- run: nohup pnpm prod-start &

- run: pnpm test:benchmark
id: benchmark
continue-on-error: true
Expand All @@ -49,6 +51,7 @@ jobs:
else
echo "BENCHMARK_RESULT=Benchmark failed to run or produce results" >> $GITHUB_ENV
fi

- uses: mshick/add-pr-comment@v2
with:
allow-repeats: true
Expand Down
4 changes: 3 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ After forking the repository, run the following commands to get started:
4. Let us know if you are working on something and be sure to open a PR if you got any changes. Happy coding!

*(1): If you are getting `Cannot find matching keyid` update corepack to the latest version with `npm i -g corepack`.

*(2): If still something doesn't work ensure you have the right nodejs version with `node -v` (tested on 22.x)
*(3): For GitHub codespaces (cloud ide): Run `pnpm i @rsbuild/[email protected] @rsbuild/[email protected] @rsbuild/[email protected] @rsbuild/[email protected]` command to avoid crashes because of limited ram

<!-- *(3): For GitHub codespaces (cloud ide): Run `pnpm i @rsbuild/[email protected] @rsbuild/[email protected] @rsbuild/[email protected] @rsbuild/[email protected]` command to avoid crashes because of limited ram -->

## Project Structure

Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ FROM node:18-alpine AS build
RUN apk add git
WORKDIR /app
COPY . /app
# install pnpm
RUN npm i -g [email protected]
# install pnpm with corepack
RUN corepack enable
# Build arguments
ARG DOWNLOAD_SOUNDS=false
ARG DISABLE_SERVICE_WORKER=false
Expand Down Expand Up @@ -35,7 +35,7 @@ WORKDIR /app
COPY --from=build /app/dist /app/dist
COPY server.js /app/server.js
# Install express
RUN npm i -g pnpm@9.0.4
RUN npm i -g pnpm@10.8.0
RUN npm init -yp
RUN pnpm i express github:zardoy/prismarinejs-net-browserify compression cors
EXPOSE 8080
Expand Down
2 changes: 2 additions & 0 deletions config.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
"description": "Very nice a polite server. Must try for everyone!"
}
],
"rightSideText": "A Minecraft client clone in the browser!",
"splashText": "Gen is cooking!",
"pauseLinks": [
[
{
Expand Down
38 changes: 24 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,18 +76,18 @@
"esbuild-plugin-polyfill-node": "^0.3.0",
"express": "^4.18.2",
"filesize": "^10.0.12",
"flying-squid": "npm:@zardoy/flying-squid@^0.0.58",
"flying-squid": "npm:@zardoy/flying-squid@^0.0.59",
"fs-extra": "^11.1.1",
"google-drive-browserfs": "github:zardoy/browserfs#google-drive",
"jszip": "^3.10.1",
"lodash-es": "^4.17.21",
"mcraft-fun-mineflayer": "^0.1.14",
"minecraft-data": "3.83.1",
"minecraft-protocol": "github:PrismarineJS/node-minecraft-protocol#master",
"mineflayer-item-map-downloader": "github:zardoy/mineflayer-item-map-downloader",
"mojangson": "^2.0.4",
"net-browserify": "github:zardoy/prismarinejs-net-browserify",
"node-gzip": "^1.1.2",
"mcraft-fun-mineflayer": "^0.1.14",
"peerjs": "^1.5.0",
"pixelarticons": "^1.8.1",
"pretty-bytes": "^6.1.1",
Expand Down Expand Up @@ -119,11 +119,11 @@
"workbox-build": "^7.0.0"
},
"devDependencies": {
"@rsbuild/core": "1.0.1-beta.9",
"@rsbuild/plugin-node-polyfill": "1.0.3",
"@rsbuild/plugin-react": "1.0.1-beta.9",
"@rsbuild/plugin-type-check": "1.0.1-beta.9",
"@rsbuild/plugin-typed-css-modules": "1.0.1",
"@rsbuild/core": "1.3.5",
"@rsbuild/plugin-node-polyfill": "1.3.0",
"@rsbuild/plugin-react": "1.2.0",
"@rsbuild/plugin-type-check": "1.2.1",
"@rsbuild/plugin-typed-css-modules": "1.0.2",
"@storybook/addon-essentials": "^7.4.6",
"@storybook/addon-links": "^7.4.6",
"@storybook/blocks": "^7.4.6",
Expand Down Expand Up @@ -151,17 +151,17 @@
"http-browserify": "^1.7.0",
"http-server": "^14.1.1",
"https-browserify": "^1.0.0",
"mc-assets": "^0.2.52",
"mineflayer-mouse": "^0.1.7",
"mc-assets": "^0.2.53",
"minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
"mineflayer": "github:GenerelSchwerz/mineflayer",
"mineflayer-mouse": "^0.1.7",
"mineflayer-pathfinder": "^2.4.4",
"npm-run-all": "^4.1.5",
"os-browserify": "^0.3.0",
"path-browserify": "^1.0.1",
"path-exists-cli": "^2.0.0",
"renderer": "link:renderer",
"process": "github:PrismarineJS/node-process",
"renderer": "link:renderer",
"rimraf": "^5.0.1",
"storybook": "^7.4.6",
"stream-browserify": "^3.0.0",
Expand Down Expand Up @@ -214,11 +214,21 @@
"ignoreDependencies": []
},
"patchedDependencies": {
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]"
}
"minecraft-protocol": "patches/minecraft-protocol.patch"
},
"ignoredBuiltDependencies": [
"canvas",
"core-js",
"gl"
],
"onlyBuiltDependencies": [
"sharp",
"cypress",
"esbuild",
"fsevents"
]
},
"packageManager": "pnpm@9.0.4"
"packageManager": "pnpm@10.8.0+sha512.0e82714d1b5b43c74610193cb20734897c1d00de89d0e18420aebc5977fa13d780a9cb05734624e81ebd81cc876cd464794850641c48b9544326b5622ca29971"
}
File renamed without changes.
16 changes: 0 additions & 16 deletions patches/[email protected]

This file was deleted.

Loading
Loading