Next (#66)

CONTRIBUTING.md

@@ -8,6 +8,9 @@ After forking the repository, run the following commands to get started:
 
 A few notes:
 
+- Use `next` branch for development and as base & target branch for pull requests if possible.
+- To link dependency locally e.g. flying-squid add this to `pnpm` > `overrides` of root package.json: `"flying-squid": "file:../space-squid",` (with some modules `pnpm link` also works)
+
 - It's recommended to use debugger for debugging. VSCode has a great debugger built-in. If debugger is slow, you can use `--no-sources` flag that would allow browser to speedup .map file parsing.
 - Some data are cached between restarts. If you see something doesn't work after upgrading dependencies, try to clear the by simply removing the `dist` folder.
 - The same folder `dist` is used for both development and production builds, so be careful when deploying the project.

config.json

@@ -3,5 +3,5 @@
   "defaultHost": "<from-proxy>",
   "defaultProxy": "zardoy.site:2344",
   "defaultVersion": "1.18.2",
-  "mapsProvider": "zardoy.site/maps"
+  "mapsProvider": "https://maps.mcraft.fun/"
 }

esbuild.mjs

@@ -70,7 +70,8 @@ const buildOptions = {
     'process.env.NODE_ENV': JSON.stringify(dev ? 'development' : 'production'),
     'process.env.BUILD_VERSION': JSON.stringify(!dev ? buildingVersion : 'undefined'),
     'process.env.GITHUB_URL':
-      JSON.stringify(`https://github.com/${process.env.GITHUB_REPOSITORY || `${process.env.VERCEL_GIT_REPO_OWNER}/${process.env.VERCEL_GIT_REPO_SLUG}`}`)
+      JSON.stringify(`https://github.com/${process.env.GITHUB_REPOSITORY || `${process.env.VERCEL_GIT_REPO_OWNER}/${process.env.VERCEL_GIT_REPO_SLUG}`}`),
+    'process.env.DEPS_VERSIONS': JSON.stringify({})
   },
   loader: {
     // todo use external or resolve issues with duplicating

index.html

@@ -12,8 +12,8 @@
           <div style="position: fixed;inset: 0;z-index: -1;background-color: rgba(0, 0, 0, 0.8);"></div>
       </div>
       <div>
-          <div style="font-size: calc(var(--font-size) * 1.8);color: lightgray;">Loading...</div>
-          <div style="font-size: var(--font-size);color: rgb(176, 176, 176);">A true Minecraft client in your browser!</div>
+          <div style="font-size: calc(var(--font-size) * 1.8);color: lightgray;" class="title">Loading...</div>
+          <div style="font-size: var(--font-size);color: rgb(176, 176, 176);" class="subtitle">A true Minecraft client in your browser!</div>
       </div>
   </div>
   `
@@ -22,6 +22,17 @@
         if (!window.pageLoaded) {
           document.documentElement.appendChild(loadingDivElem)
         }
+        // load error handling
+        const onError = (message) => {
+          console.log(message)
+          if (document.querySelector('.initial-loader') && document.querySelector('.initial-loader').querySelector('.title').textContent !== 'Error') {
+            document.querySelector('.initial-loader').querySelector('.title').textContent = 'Error'
+            document.querySelector('.initial-loader').querySelector('.subtitle').textContent = message
+            window.location.hash = '#dev' // show eruda
+          }
+        }
+        window.addEventListener('unhandledrejection', (e) => onError(e.reason))
+        window.addEventListener('error', (e) => onError(e.message))
       </script>
       <script type="module" async>
         const checkLoadEruda = () => {

package.json

@@ -53,7 +53,7 @@
     "lit": "^2.8.0",
     "lodash-es": "^4.17.21",
     "minecraft-assets": "^1.12.2",
-    "minecraft-data": "3.60.0",
+    "minecraft-data": "3.61.0",
     "net-browserify": "github:zardoy/prismarinejs-net-browserify",
     "node-gzip": "^1.1.2",
     "peerjs": "^1.5.0",
@@ -129,7 +129,7 @@
       "diamond-square": "github:zardoy/diamond-square",
       "prismarine-block": "github:zardoy/prismarine-block#next-era",
       "prismarine-world": "github:zardoy/prismarine-world#next-era",
-      "minecraft-data": "3.60.0",
+      "minecraft-data": "3.61.0",
       "prismarine-provider-anvil": "github:zardoy/prismarine-provider-anvil#everything",
       "minecraft-protocol": "github:zardoy/minecraft-protocol#everything",
       "react": "^18.2.0"