Release

.github/workflows/next-deploy.yml

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

.gitignore

@@ -18,5 +18,6 @@ out
 generated
 storybook-static
 server-jar
+config.local.json
 
 src/react/npmReactComponents.ts

package.json

@@ -73,7 +73,7 @@
     "google-drive-browserfs": "github:zardoy/browserfs#google-drive",
     "jszip": "^3.10.1",
     "lodash-es": "^4.17.21",
-    "minecraft-data": "3.80.0",
+    "minecraft-data": "3.83.1",
     "minecraft-protocol": "github:PrismarineJS/node-minecraft-protocol#master",
     "mineflayer-item-map-downloader": "github:zardoy/mineflayer-item-map-downloader",
     "mojangson": "^2.0.4",
@@ -174,7 +174,7 @@
       "diamond-square": "github:zardoy/diamond-square",
       "prismarine-block": "github:zardoy/prismarine-block#next-era",
       "prismarine-world": "github:zardoy/prismarine-world#next-era",
-      "minecraft-data": "3.80.0",
+      "minecraft-data": "3.83.1",
       "prismarine-provider-anvil": "github:zardoy/prismarine-provider-anvil#everything",
       "prismarine-physics": "github:zardoy/prismarine-physics",
       "minecraft-protocol": "github:PrismarineJS/node-minecraft-protocol#master",

prismarine-viewer/viewer/lib/mesher/test/tests.test.ts

@@ -50,7 +50,6 @@ test('Known blocks are not rendered', () => {
   expect(missingBlocks).toMatchInlineSnapshot(`
     {
       "bubble_column": true,
-      "creaking_heart": true,
       "end_gateway": true,
       "end_portal": true,
       "structure_void": true,

rsbuild.config.ts

@@ -95,10 +95,14 @@ const appConfig = defineConfig({
                         fs.copyFileSync('./assets/release.json', './dist/release.json')
                     }
                     const configJson = JSON.parse(fs.readFileSync('./config.json', 'utf8'))
+                    let configLocalJson = {}
+                    try {
+                        configLocalJson = JSON.parse(fs.readFileSync('./config.local.json', 'utf8'))
+                    } catch (err) {}
                     if (dev) {
                         configJson.defaultProxy = ':8080'
                     }
-                    fs.writeFileSync('./dist/config.json', JSON.stringify(configJson), 'utf8')
+                    fs.writeFileSync('./dist/config.json', JSON.stringify({ ...configJson, ...configLocalJson }), 'utf8')
                     // childProcess.execSync('./scripts/prepareSounds.mjs', { stdio: 'inherit' })
                     // childProcess.execSync('tsx ./scripts/genMcDataTypes.ts', { stdio: 'inherit' })
                     // childProcess.execSync('tsx ./scripts/genPixelartTypes.ts', { stdio: 'inherit' })

src/globalState.ts

@@ -114,6 +114,9 @@ export type AppConfig = {
   peerJsServerFallback?: string
   promoteServers?: Array<{ ip, description, version? }>
   mapsProvider?: string
+
+  defaultSettings?: Record<string, any>
+  allowAutoConnect?: boolean
 }
 
 export const miscUiState = proxy({

src/react/AddServerOrConnect.tsx

@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { useEffect } from 'react'
 import Screen from './Screen'
 import Input from './Input'
 import Button from './Button'
@@ -26,11 +26,12 @@ interface Props {
   accounts?: string[]
   authenticatedAccounts?: number
   versions?: string[]
+  allowAutoConnect?: boolean
 }
 
 const ELEMENTS_WIDTH = 190
 
-export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQs, onQsConnect, placeholders, accounts, versions, authenticatedAccounts }: Props) => {
+export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQs, onQsConnect, placeholders, accounts, versions, allowAutoConnect }: Props) => {
   const qsParams = parseQs ? new URLSearchParams(window.location.search) : undefined
   const qsParamName = qsParams?.get('name')
   const qsParamIp = qsParams?.get('ip')
@@ -40,7 +41,7 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
   const qsParamLockConnect = qsParams?.get('lockConnect')
 
   const qsIpParts = qsParamIp?.split(':')
-  const ipParts = initialData?.ip.split(':')
+  const ipParts = initialData?.ip ? initialData?.ip.split(':') : undefined
 
   const [serverName, setServerName] = React.useState(initialData?.name ?? qsParamName ?? '')
   const [serverIp, setServerIp] = React.useState(ipParts?.[0] ?? qsIpParts?.[0] ?? '')
@@ -69,6 +70,12 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
     authenticatedAccountOverride,
   }
 
+  useEffect(() => {
+    if (qsParams?.get('autoConnect') === 'true' && qsParams?.get('ip') && allowAutoConnect) {
+      onQsConnect?.(commonUseOptions)
+    }
+  }, [])
+
   return <Screen title={qsParamIp ? 'Connect to Server' : title} backdrop>
     <form
       style={{

src/react/ServersListProvider.tsx

@@ -252,6 +252,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
   })
 
   const editModalJsx = isEditScreenModal ? <AddServerOrConnect
+    allowAutoConnect={miscUiState.appConfig?.allowAutoConnect}
     placeholders={{
       proxyOverride: selectedProxy,
       usernameOverride: defaultUsername,