remove renderer from client

.github/workflows/preview.yml

@@ -115,4 +115,4 @@ jobs:
         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
+          done

.gitignore

@@ -22,3 +22,4 @@ config.local.json
 logs/
 
 src/react/npmReactComponents.ts
+.env*.local

CONTRIBUTING.md

@@ -33,32 +33,6 @@ Paths:
 - `src` - main app source code
 - `src/react` - React components - almost all UI is in this folder. Almost every component has its base (reused in app and storybook) and `Provider` - which is a component that provides context to its children. Consider looking at DeathScreen component to see how it's used.
 
-### Renderer: Playground & Mesher (`renderer`)
-
-- Playground Scripts:
-  - Start: `pnpm run-playground` (playground, mesher + server) or `pnpm watch-playground`
-  - Build: `pnpm build-playground` or `node renderer/esbuild.mjs`
-
-- Mesher Scripts:
-  - Start: `pnpm watch-mesher`
-  - Build: `pnpm build-mesher`
-
-Paths:
-
-- `renderer` - Improved and refactored version of <https://github.com/PrismarineJS/prismarine-viewer>. Here is everything related to rendering the game world itself (no ui at all). Two most important parts here are:
-- `renderer/viewer/lib/worldrenderer.ts` - adding new objects to three.js happens here (sections)
-- `renderer/viewer/lib/models.ts` - preparing data for rendering (blocks) - happens in worker: out file - `worker.js`, building - `renderer/buildWorker.mjs`
-- `renderer/playground/playground.ts` - Playground (source of <mcraft.fun/playground.html>) Use this for testing any rendering changes. You can also modify the playground code.
-
-### Storybook (`.storybook`)
-
-Storybook is a tool for easier developing and testing React components.
-Path of all Storybook stories is `src/react/**/*.stories.tsx`.
-
-- Scripts:
-  - Start: `pnpm storybook`
-  - Build: `pnpm build-storybook`
-
 ## Core-related
 
 How different modules are used:
@@ -69,7 +43,7 @@ How different modules are used:
 
 To start the main web app and playground, run `pnpm run-all`. Note is doesn't start storybook and tests.
 
-## Cypress Tests (E2E)
+## Cypress Tests (Browser Integration)
 
 Cypress tests are located in `cypress` folder. To run them, run `pnpm test-mc-server` and then `pnpm test:cypress` when the `pnpm prod-start` is running (or change the port to 3000 to test with the dev server). Usually you don't need to run these until you get issues on the CI.
 

config.json

@@ -31,7 +31,7 @@
     }
   ],
   "rightSideText": "A Minecraft client clone in the browser!",
-  "splashText": "Thanks for testing my chaos!",
+  "splashText": "Mind the bugs and have fun!",
   "splashTextFallback": "Welcome!",
   "pauseLinks": [
     [

cypress/plugins/index.js

@@ -2,7 +2,7 @@
 const { cypressEsbuildPreprocessor } = require('cypress-esbuild-preprocessor')
 const { initPlugin } = require('cypress-plugin-snapshots/plugin')
 const polyfill = require('esbuild-plugin-polyfill-node')
-const { startMinecraftServer } = require('./startServer')
+// const { startMinecraftServer } = require('./startServer')
 
 module.exports = (on, config) => {
   initPlugin(on, config)
@@ -24,10 +24,10 @@ module.exports = (on, config) => {
       return null
     },
   })
-  on('task', {
-    async startServer([version, port]) {
-      return startMinecraftServer(version, port)
-    }
-  })
+  // on('task', {
+  //   async startServer([version, port]) {
+  //     return startMinecraftServer(version, port)
+  //   }
+  // })
   return config
 }

experiments/state.ts

@@ -1,4 +1,4 @@
-import { SmoothSwitcher } from '../renderer/viewer/lib/smoothSwitcher'
+import { SmoothSwitcher } from 'minecraft-renderer/src/lib/smoothSwitcher'
 
 const div = document.createElement('div')
 div.style.width = '100px'

experiments/three-fireworks.ts

@@ -1,6 +1,6 @@
 import * as THREE from 'three'
 import { FirstPersonControls } from 'three/addons/controls/FirstPersonControls.js'
-import { FireworksManager } from '../renderer/viewer/three/fireworks'
+import { FireworksManager } from 'minecraft-renderer/src/three/fireworks'
 
 // Create scene, camera and renderer
 const scene = new THREE.Scene()

experiments/three-item.ts

@@ -1,7 +1,7 @@
 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'
+import { createItemMeshFromCanvas, createItemMesh } from 'minecraft-renderer/src/three/itemMesh'
 
 // Create scene, camera and renderer
 const scene = new THREE.Scene()

experiments/three-labels.ts

@@ -1,6 +1,6 @@
 import * as THREE from 'three'
 import { FirstPersonControls } from 'three/addons/controls/FirstPersonControls.js'
-import { createWaypointSprite, WAYPOINT_CONFIG } from '../renderer/viewer/three/waypointSprite'
+import { createWaypointSprite, WAYPOINT_CONFIG } from 'minecraft-renderer/src/three/waypointSprite'
 
 // Create scene, camera and renderer
 const scene = new THREE.Scene()

package.json

@@ -5,10 +5,10 @@
   "scripts": {
     "dev-rsbuild": "rsbuild dev",
     "dev-proxy": "node server.js",
-    "start": "run-p dev-proxy dev-rsbuild watch-mesher",
-    "start2": "run-p dev-rsbuild watch-mesher",
+    "start": "run-p dev-proxy dev-rsbuild",
+    "start2": "run-p dev-rsbuild",
     "start-metrics": "ENABLE_METRICS=true rsbuild dev",
-    "build": "pnpm build-other-workers && rsbuild build",
+    "build": "rsbuild build",
     "build-analyze": "BUNDLE_ANALYZE=true rsbuild build && pnpm build-other-workers",
     "build-single-file": "SINGLE_FILE_BUILD=true rsbuild build",
     "prepare-project": "tsx scripts/genShims.ts && tsx scripts/makeOptimizedMcData.mjs && tsx scripts/genLargeDataAliases.ts",
@@ -20,20 +20,14 @@
     "test:e2e": "start-test http-get://localhost:8080 test:cypress",
     "prod-start": "node server.js --prod",
     "test-mc-server": "tsx cypress/minecraft-server.mjs",
-    "lint": "eslint \"{src,cypress,renderer}/**/*.{ts,js,jsx,tsx}\"",
+    "lint": "eslint \"{src,cypress}/**/*.{ts,js,jsx,tsx}\"",
     "lint-fix": "pnpm lint --fix",
     "storybook": "storybook dev -p 6006",
     "build-storybook": "storybook build && node scripts/build.js moveStorybookFiles",
     "start-experiments": "vite --config experiments/vite.config.ts --host",
-    "watch-other-workers": "echo NOT IMPLEMENTED",
-    "build-other-workers": "echo NOT IMPLEMENTED",
-    "build-mesher": "node renderer/buildMesherWorker.mjs",
-    "watch-mesher": "pnpm build-mesher -w",
-    "run-playground": "run-p watch-mesher watch-other-workers watch-playground",
-    "run-all": "run-p start run-playground",
-    "watch-playground": "rsbuild dev --config renderer/rsbuild.config.ts",
     "update-git-deps": "tsx scripts/updateGitDeps.ts",
-    "request-data": "tsx scripts/requestData.ts"
+    "request-data": "tsx scripts/requestData.ts",
+    "check-bundled-duplicates": "node scripts/findBundledDuplicateDeps.mjs"
   },
   "keywords": [
     "prismarine",
@@ -90,6 +84,7 @@
     "minecraft-data": "0.0.0",
     "minecraft-inventory": "^0.1.45",
     "minecraft-protocol": "github:PrismarineJS/node-minecraft-protocol#master",
+    "minecraft-renderer": "^0.1.52",
     "mineflayer-item-map-downloader": "github:zardoy/mineflayer-item-map-downloader",
     "mojangson": "^2.0.4",
     "net-browserify": "github:zardoy/prismarinejs-net-browserify",
@@ -163,7 +158,6 @@
     "path-browserify": "^1.0.1",
     "path-exists-cli": "^2.0.0",
     "process": "github:PrismarineJS/node-process",
-    "renderer": "link:renderer",
     "rimraf": "^5.0.1",
     "storybook": "^7.4.6",
     "stream-browserify": "^3.0.0",
@@ -202,6 +196,7 @@
       "buffer": "^6.0.3",
       "vec3": "0.1.10",
       "three": "0.154.0",
+      "@types/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",
@@ -211,7 +206,8 @@
       "minecraft-protocol": "github:PrismarineJS/node-minecraft-protocol#master",
       "react": "^18.2.0",
       "prismarine-chunk": "github:zardoy/prismarine-chunk#master",
-      "prismarine-item": "latest"
+      "prismarine-item": "latest",
+      "valtio": "1.13.2"
     },
     "updateConfig": {
       "ignoreDependencies": [