From 022bdfae9566737b744256f2973924ba01fd8e39 Mon Sep 17 00:00:00 2001 From: MrlingXD <90316914+wling-art@users.noreply.github.com> Date: Wed, 25 Feb 2026 03:08:02 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=E4=BD=BF=E7=94=A8=20oxfmt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/test-pr.yml | 64 +++--- .github/workflows/test.yml | 64 +++--- .prettierrc => .oxfmtrc.json | 12 +- .prettierignore | 2 - .vscode/extensions.json | 2 +- .vscode/settings.json | 5 + package.json | 3 +- pnpm-lock.yaml | 209 ++++++++++++++++++ .../docs/bedrock/waterdogepe/config.mdx | 48 ++-- .../docs/bedrock/waterdogepe/install.mdx | 15 +- .../docs/general/advance/bot/general.mdx | 12 +- .../player-management/client-distribution.mdx | 2 +- src/content/docs/java/advance/optimize/go.mdx | 10 +- .../mobile-player/client/amethyst-ios.mdx | 32 +-- .../geyser/upgrade/extended/fix.mdx | 2 +- tsconfig.json | 2 + 16 files changed, 347 insertions(+), 137 deletions(-) rename .prettierrc => .oxfmtrc.json (73%) delete mode 100644 .prettierignore create mode 100644 .vscode/settings.json diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index ea3deb126..a5340dd62 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -1,40 +1,40 @@ name: Test Pull Request on: - pull_request: - types: [opened, reopened, synchronize] + pull_request: + types: [opened, reopened, synchronize] jobs: - deploy: - runs-on: ubuntu-latest - steps: - # 拉取代码 - - name: Checkout - uses: actions/checkout@v6 - with: - fetch-depth: 1 - - name: Install Node.js - uses: actions/setup-node@v6 - with: - node-version: 24 - - name: Install pnpm - uses: pnpm/action-setup@v4 - with: - run_install: false + deploy: + runs-on: ubuntu-latest + steps: + # 拉取代码 + - name: Checkout + uses: actions/checkout@v6 + with: + fetch-depth: 1 + - name: Install Node.js + uses: actions/setup-node@v6 + with: + node-version: 24 + - name: Install pnpm + uses: pnpm/action-setup@v4 + with: + run_install: false - - name: Get pnpm store directory - shell: bash - run: echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV - - name: Setup pnpm cache - uses: actions/cache@v5 - with: - path: ${{ env.STORE_PATH }} - key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}-pnpm-store- + - name: Get pnpm store directory + shell: bash + run: echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV + - name: Setup pnpm cache + uses: actions/cache@v5 + with: + path: ${{ env.STORE_PATH }} + key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} + restore-keys: | + ${{ runner.os }}-pnpm-store- - - name: Install - run: pnpm install --frozen-lockfile + - name: Install + run: pnpm install --frozen-lockfile - - name: Build - run: pnpm run build + - name: Build + run: pnpm run build diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 64091d619..87b5d3226 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,40 +1,40 @@ name: Test on: - push: - branches: ["main"] + push: + branches: ["main"] jobs: - deploy: - runs-on: ubuntu-latest - steps: - # 拉取代码 - - name: Checkout - uses: actions/checkout@v6 - with: - fetch-depth: 1 - - name: Install Node.js - uses: actions/setup-node@v6 - with: - node-version: 24 - - name: Install pnpm - uses: pnpm/action-setup@v4 - with: - run_install: false + deploy: + runs-on: ubuntu-latest + steps: + # 拉取代码 + - name: Checkout + uses: actions/checkout@v6 + with: + fetch-depth: 1 + - name: Install Node.js + uses: actions/setup-node@v6 + with: + node-version: 24 + - name: Install pnpm + uses: pnpm/action-setup@v4 + with: + run_install: false - - name: Get pnpm store directory - shell: bash - run: echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV - - name: Setup pnpm cache - uses: actions/cache@v5 - with: - path: ${{ env.STORE_PATH }} - key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}-pnpm-store- + - name: Get pnpm store directory + shell: bash + run: echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV + - name: Setup pnpm cache + uses: actions/cache@v5 + with: + path: ${{ env.STORE_PATH }} + key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} + restore-keys: | + ${{ runner.os }}-pnpm-store- - - name: Install - run: pnpm install --frozen-lockfile + - name: Install + run: pnpm install --frozen-lockfile - - name: Build - run: pnpm run build + - name: Build + run: pnpm run build diff --git a/.prettierrc b/.oxfmtrc.json similarity index 73% rename from .prettierrc rename to .oxfmtrc.json index 36ead63ce..2a6354b82 100644 --- a/.prettierrc +++ b/.oxfmtrc.json @@ -1,5 +1,5 @@ { - "experimentalTernaries": false, + "$schema": "./node_modules/oxfmt/configuration_schema.json", "printWidth": 120, "tabWidth": 4, "useTabs": false, @@ -17,12 +17,6 @@ "endOfLine": "lf", "embeddedLanguageFormatting": "auto", "singleAttributePerLine": false, - "overrides": [ - { - "files": ["*.yml"], - "options": { - "tabWidth": 2 - } - } - ] + "sortPackageJson": false, + "ignorePatterns": ["pnpm-lock.yaml"] } diff --git a/.prettierignore b/.prettierignore deleted file mode 100644 index fb4958219..000000000 --- a/.prettierignore +++ /dev/null @@ -1,2 +0,0 @@ -# pnpm dust -pnpm-lock.yaml \ No newline at end of file diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 8c353d877..bccc2d41e 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -3,6 +3,6 @@ "davidanson.vscode-markdownlint", "huacnlee.autocorrect", "astro-build.astro-vscode", - "esbenp.prettier-vscode" + "oxc.oxc-vscode" ] } diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..c56512ce6 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "oxc.fmt.configPath": ".oxfmtrc.json", + "editor.defaultFormatter": "oxc.oxc-vscode", + "editor.formatOnSave": true +} diff --git a/package.json b/package.json index cc2a479fd..5d7c5f783 100644 --- a/package.json +++ b/package.json @@ -25,9 +25,10 @@ "vue": "^3.5.27" }, "devDependencies": { - "astro-vtbot": "^2.1.10", "@vite-pwa/astro": "^1.2.0", + "astro-vtbot": "^2.1.10", "daisyui": "^5.5.17", + "oxfmt": "^0.35.0", "starlight-contributor-list": "^0.3.2", "starlight-links-validator": "^0.19.2", "starlight-scroll-to-top": "^0.4.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9f8716588..677df9ffa 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -57,6 +57,9 @@ importers: daisyui: specifier: ^5.5.17 version: 5.5.17 + oxfmt: + specifier: ^0.35.0 + version: 0.35.0 starlight-contributor-list: specifier: ^0.3.2 version: 0.3.2(@astrojs/starlight@0.37.6(astro@5.17.1(@types/node@25.0.2)(jiti@2.6.1)(lightningcss@1.30.2)(rollup@2.79.2)(sass-embedded@1.83.0)(sass@1.96.0)(terser@5.46.0)(typescript@5.9.3)(yaml@2.8.2))) @@ -1204,6 +1207,120 @@ packages: '@oslojs/encoding@1.1.0': resolution: {integrity: sha512-70wQhgYmndg4GCPxPPxPGevRKqTIJ2Nh4OkiMWmDAVYsTQ+Ta7Sq+rPevXyXGdzr30/qZBnyOalCszoMxlyldQ==} + '@oxfmt/binding-android-arm-eabi@0.35.0': + resolution: {integrity: sha512-BaRKlM3DyG81y/xWTsE6gZiv89F/3pHe2BqX2H4JbiB8HNVlWWtplzgATAE5IDSdwChdeuWLDTQzJ92Lglw3ZA==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm] + os: [android] + + '@oxfmt/binding-android-arm64@0.35.0': + resolution: {integrity: sha512-/O+EbuAJYs6nde/anv+aID6uHsGQApyE9JtYBo/79KyU8e6RBN3DMbT0ix97y1SOnCglurmL2iZ+hlohjP2PnQ==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [android] + + '@oxfmt/binding-darwin-arm64@0.35.0': + resolution: {integrity: sha512-pGqRtqlNdn9d4VrmGUWVyQjkw79ryhI6je9y2jfqNUIZCfqceob+R97YYAoG7C5TFyt8ILdLVoN+L2vw/hSFyA==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [darwin] + + '@oxfmt/binding-darwin-x64@0.35.0': + resolution: {integrity: sha512-8GmsDcSozTPjrCJeGpp+sCmS9+9V5yRrdEZ1p/sTWxPG5nYeAfSLuS0nuEYjXSO+CtdSbStIW6dxa+4NM58yRw==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [darwin] + + '@oxfmt/binding-freebsd-x64@0.35.0': + resolution: {integrity: sha512-QyfKfTe0ytHpFKHAcHCGQEzN45QSqq1AHJOYYxQMgLM3KY4xu8OsXHpCnINjDsV4XGnQzczJDU9e04Zmd8XqIQ==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [freebsd] + + '@oxfmt/binding-linux-arm-gnueabihf@0.35.0': + resolution: {integrity: sha512-u+kv3JD6P3J38oOyUaiCqgY5TNESzBRZJ5lyZQ6c2czUW2v5SIN9E/KWWa9vxoc+P8AFXQFUVrdzGy1tK+nbPQ==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm] + os: [linux] + + '@oxfmt/binding-linux-arm-musleabihf@0.35.0': + resolution: {integrity: sha512-1NiZroCiV57I7Pf8kOH4XGR366kW5zir3VfSMBU2D0V14GpYjiYmPYFAoJboZvp8ACnZKUReWyMkNKSa5ad58A==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm] + os: [linux] + + '@oxfmt/binding-linux-arm64-gnu@0.35.0': + resolution: {integrity: sha512-7Q0Xeg7ZnW2nxnZ4R7aF6DEbCFls4skgHZg+I63XitpNvJCbVIU8MFOTZlvZGRsY9+rPgWPQGeUpLHlyx0wvMA==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [linux] + + '@oxfmt/binding-linux-arm64-musl@0.35.0': + resolution: {integrity: sha512-5Okqi+uhYFxwKz8hcnUftNNwdm8BCkf6GSCbcz9xJxYMm87k1E4p7PEmAAbhLTk7cjSdDre6TDL0pDzNX+Y22Q==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [linux] + + '@oxfmt/binding-linux-ppc64-gnu@0.35.0': + resolution: {integrity: sha512-9k66pbZQXM/lBJWys3Xbc5yhl4JexyfqkEf/tvtq8976VIJnLAAL3M127xHA3ifYSqxdVHfVGTg84eiBHCGcNw==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [ppc64] + os: [linux] + + '@oxfmt/binding-linux-riscv64-gnu@0.35.0': + resolution: {integrity: sha512-aUcY9ofKPtjO52idT6t0SAQvEF6ctjzUQa1lLp7GDsRpSBvuTrBQGeq0rYKz3gN8dMIQ7mtMdGD9tT4LhR8jAQ==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [riscv64] + os: [linux] + + '@oxfmt/binding-linux-riscv64-musl@0.35.0': + resolution: {integrity: sha512-C6yhY5Hvc2sGM+mCPek9ZLe5xRUOC/BvhAt2qIWFAeXMn4il04EYIjl3DsWiJr0xDMTJhvMOmD55xTRPlNp39w==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [riscv64] + os: [linux] + + '@oxfmt/binding-linux-s390x-gnu@0.35.0': + resolution: {integrity: sha512-RG2hlvOMK4OMZpO3mt8MpxLQ0AAezlFqhn5mI/g5YrVbPFyoCv9a34AAvbSJS501ocOxlFIRcKEuw5hFvddf9g==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [s390x] + os: [linux] + + '@oxfmt/binding-linux-x64-gnu@0.35.0': + resolution: {integrity: sha512-wzmh90Pwvqj9xOKHJjkQYBpydRkaXG77ZvDz+iFDRRQpnqIEqGm5gmim2s6vnZIkDGsvKCuTdtxm0GFmBjM1+w==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [linux] + + '@oxfmt/binding-linux-x64-musl@0.35.0': + resolution: {integrity: sha512-+HCqYCJPCUy5I+b2cf+gUVaApfgtoQT3HdnSg/l7NIcLHOhKstlYaGyrFZLmUpQt4WkFbpGKZZayG6zjRU0KFA==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [linux] + + '@oxfmt/binding-openharmony-arm64@0.35.0': + resolution: {integrity: sha512-kFYmWfR9YL78XyO5ws+1dsxNvZoD973qfVMNFOS4e9bcHXGF7DvGC2tY5UDFwyMCeB33t3sDIuGONKggnVNSJA==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [openharmony] + + '@oxfmt/binding-win32-arm64-msvc@0.35.0': + resolution: {integrity: sha512-uD/NGdM65eKNCDGyTGdO8e9n3IHX+wwuorBvEYrPJXhDXL9qz6gzddmXH8EN04ejUXUujlq4FsoSeCfbg0Y+Jg==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [win32] + + '@oxfmt/binding-win32-ia32-msvc@0.35.0': + resolution: {integrity: sha512-oSRD2k8J2uxYDEKR2nAE/YTY9PobOEnhZgCmspHu0+yBQ665yH8lFErQVSTE7fcGJmJp/cC6322/gc8VFuQf7g==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [ia32] + os: [win32] + + '@oxfmt/binding-win32-x64-msvc@0.35.0': + resolution: {integrity: sha512-WCDJjlS95NboR0ugI2BEwzt1tYvRDorDRM9Lvctls1SLyKYuNRCyrPwp1urUPFBnwgBNn9p2/gnmo7gFMySRoQ==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [win32] + '@pagefind/darwin-arm64@1.4.0': resolution: {integrity: sha512-2vMqkbv3lbx1Awea90gTaBsvpzgRs7MuSgKDxW0m9oV1GPZCZbZBJg/qL83GIUEN2BFlY46dtUZi54pwH+/pTQ==} cpu: [arm64] @@ -3664,6 +3781,11 @@ packages: resolution: {integrity: sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==} engines: {node: '>= 0.4'} + oxfmt@0.35.0: + resolution: {integrity: sha512-QYeXWkP+aLt7utt5SLivNIk09glWx9QE235ODjgcEZ3sd1VMaUBSpLymh6ZRCA76gD2rMP4bXanUz/fx+nLM9Q==} + engines: {node: ^20.19.0 || >=22.12.0} + hasBin: true + p-finally@1.0.0: resolution: {integrity: sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==} engines: {node: '>=4'} @@ -4428,6 +4550,10 @@ packages: resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==} engines: {node: '>=12.0.0'} + tinypool@2.1.0: + resolution: {integrity: sha512-Pugqs6M0m7Lv1I7FtxN4aoyToKg1C4tu+/381vH35y8oENM/Ai7f7C4StcoK4/+BSw9ebcS8jRiVrORFKCALLw==} + engines: {node: ^20.0.0 || >=22.0.0} + totalist@3.0.1: resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==} engines: {node: '>=6'} @@ -6435,6 +6561,63 @@ snapshots: '@oslojs/encoding@1.1.0': {} + '@oxfmt/binding-android-arm-eabi@0.35.0': + optional: true + + '@oxfmt/binding-android-arm64@0.35.0': + optional: true + + '@oxfmt/binding-darwin-arm64@0.35.0': + optional: true + + '@oxfmt/binding-darwin-x64@0.35.0': + optional: true + + '@oxfmt/binding-freebsd-x64@0.35.0': + optional: true + + '@oxfmt/binding-linux-arm-gnueabihf@0.35.0': + optional: true + + '@oxfmt/binding-linux-arm-musleabihf@0.35.0': + optional: true + + '@oxfmt/binding-linux-arm64-gnu@0.35.0': + optional: true + + '@oxfmt/binding-linux-arm64-musl@0.35.0': + optional: true + + '@oxfmt/binding-linux-ppc64-gnu@0.35.0': + optional: true + + '@oxfmt/binding-linux-riscv64-gnu@0.35.0': + optional: true + + '@oxfmt/binding-linux-riscv64-musl@0.35.0': + optional: true + + '@oxfmt/binding-linux-s390x-gnu@0.35.0': + optional: true + + '@oxfmt/binding-linux-x64-gnu@0.35.0': + optional: true + + '@oxfmt/binding-linux-x64-musl@0.35.0': + optional: true + + '@oxfmt/binding-openharmony-arm64@0.35.0': + optional: true + + '@oxfmt/binding-win32-arm64-msvc@0.35.0': + optional: true + + '@oxfmt/binding-win32-ia32-msvc@0.35.0': + optional: true + + '@oxfmt/binding-win32-x64-msvc@0.35.0': + optional: true + '@pagefind/darwin-arm64@1.4.0': optional: true @@ -9487,6 +9670,30 @@ snapshots: object-keys: 1.1.1 safe-push-apply: 1.0.0 + oxfmt@0.35.0: + dependencies: + tinypool: 2.1.0 + optionalDependencies: + '@oxfmt/binding-android-arm-eabi': 0.35.0 + '@oxfmt/binding-android-arm64': 0.35.0 + '@oxfmt/binding-darwin-arm64': 0.35.0 + '@oxfmt/binding-darwin-x64': 0.35.0 + '@oxfmt/binding-freebsd-x64': 0.35.0 + '@oxfmt/binding-linux-arm-gnueabihf': 0.35.0 + '@oxfmt/binding-linux-arm-musleabihf': 0.35.0 + '@oxfmt/binding-linux-arm64-gnu': 0.35.0 + '@oxfmt/binding-linux-arm64-musl': 0.35.0 + '@oxfmt/binding-linux-ppc64-gnu': 0.35.0 + '@oxfmt/binding-linux-riscv64-gnu': 0.35.0 + '@oxfmt/binding-linux-riscv64-musl': 0.35.0 + '@oxfmt/binding-linux-s390x-gnu': 0.35.0 + '@oxfmt/binding-linux-x64-gnu': 0.35.0 + '@oxfmt/binding-linux-x64-musl': 0.35.0 + '@oxfmt/binding-openharmony-arm64': 0.35.0 + '@oxfmt/binding-win32-arm64-msvc': 0.35.0 + '@oxfmt/binding-win32-ia32-msvc': 0.35.0 + '@oxfmt/binding-win32-x64-msvc': 0.35.0 + p-finally@1.0.0: {} p-limit@6.2.0: @@ -10412,6 +10619,8 @@ snapshots: fdir: 6.5.0(picomatch@4.0.3) picomatch: 4.0.3 + tinypool@2.1.0: {} + totalist@3.0.1: {} tr46@0.0.3: {} diff --git a/src/content/docs/bedrock/waterdogepe/config.mdx b/src/content/docs/bedrock/waterdogepe/config.mdx index 1373c1934..08553501d 100644 --- a/src/content/docs/bedrock/waterdogepe/config.mdx +++ b/src/content/docs/bedrock/waterdogepe/config.mdx @@ -10,35 +10,35 @@ title: 配置文件 # address 字段格式为 ip:端口 # public_address 为可选字段，可设置为玩家可以直接连接的 IP servers: - lobby1: - address: 127.0.0.1:19133 - public_address: play.myserver.com:19133 + lobby1: + address: 127.0.0.1:19133 + public_address: play.myserver.com:19133 listener: - # 在玩家服务器标签页中显示的 Motd，并在 ping 请求时返回 - motd: §bWaterdog§3PE - # 服务器优先级列表。如果未被插件更改，代理将把玩家连接到这些服务器中的第一个 - priorities: - - lobby1 - # 服务器绑定的地址 - host: 0.0.0.0:19132 - # 可以连接到此代理实例的最大玩家数量 - max_players: 20 - # 将玩家加入时使用的 IP 映射到特定服务器 - # 例如 skywars.xyz.com => SkyWars-1 - # 当玩家使用 skywars-xyz.com 作为服务器 IP 连接时，他将直接连接到 SkyWars-1 - forced_hosts: {} + # 在玩家服务器标签页中显示的 Motd，并在 ping 请求时返回 + motd: §bWaterdog§3PE + # 服务器优先级列表。如果未被插件更改，代理将把玩家连接到这些服务器中的第一个 + priorities: + - lobby1 + # 服务器绑定的地址 + host: 0.0.0.0:19132 + # 可以连接到此代理实例的最大玩家数量 + max_players: 20 + # 将玩家加入时使用的 IP 映射到特定服务器 + # 例如 skywars.xyz.com => SkyWars-1 + # 当玩家使用 skywars-xyz.com 作为服务器 IP 连接时，他将直接连接到 SkyWars-1 + forced_hosts: {} # 区分大小写的玩家权限列表（使用 {} 表示空） permissions: - TobiasDev: - - waterdog.player.transfer - - waterdog.player.list - alemiz003: - - waterdog.player.transfer - - waterdog.player.list + TobiasDev: + - waterdog.player.transfer + - waterdog.player.list + alemiz003: + - waterdog.player.transfer + - waterdog.player.list # 每个玩家默认应获得的权限列表（使用 [] 表示空） permissions_default: -- waterdog.command.help -- waterdog.command.info + - waterdog.command.help + - waterdog.command.info # 是否在控制台启用调试输出 enable_debug: false # 如果启用，将在客户端和代理之间创建加密连接 diff --git a/src/content/docs/bedrock/waterdogepe/install.mdx b/src/content/docs/bedrock/waterdogepe/install.mdx index d6cb3e943..54d4139f6 100644 --- a/src/content/docs/bedrock/waterdogepe/install.mdx +++ b/src/content/docs/bedrock/waterdogepe/install.mdx @@ -14,11 +14,11 @@ import { Steps } from "@astrojs/starlight/components"; 4. 创建启动脚本以运行该 JAR 文件。 - 使用 Java 11 时，我们建议添加以下参数，这将为某些 Netty 功能提供支持。 + 使用 Java 11 时，我们建议添加以下参数，这将为某些 Netty 功能提供支持。 - ```bash - -Dio.netty.tryReflectionSetAccessible=true --add-opens java.base/jdk.internal.misc=ALL-UNNAMED - ``` + ```bash + -Dio.netty.tryReflectionSetAccessible=true --add-opens java.base/jdk.internal.misc=ALL-UNNAMED + ``` 在 Windows 的启动脚本如下 @@ -34,16 +34,17 @@ import { Steps } from "@astrojs/starlight/components"; #!/bin/bash java -Xms512M -Xmx4G -jar Waterdog.jar ``` + 在启动脚本中使用上述代码仅作为模板，您也可将 512M 替换为期望分配的初始内存池大小，将 4G 替换为期望分配给代理的最大内存池大小。具体数值完全取决于您使用的底层硬件及实际需求，若无需调整则可跳过此步骤。 记得为在 Linux 的脚本赋予可执行权限，这样你就可以直接使用 bash 你的启动脚本名字.sh 来启动 WaterdogPE。 5. 成功安装 WDPE 后，需确保其正常运行。关键步骤之一是配置下游服务器实例（Nukkit/PMMP）以离线模式运行，可通过修改 server.properties 实现。需将 xbox-auth 属性设置为 false。 - 在使用代理时需禁用 PocketMine-MP 新增的另一项设置： + 在使用代理时需禁用 PocketMine-MP 新增的另一项设置： - 由于服务器认为玩家未通过认证，其 XUID 将被清除。PMMP 新增的安全验证机制会检查玩家当前 XUID 是否与历史记录匹配。 + 由于服务器认为玩家未通过认证，其 XUID 将被清除。PMMP 新增的安全验证机制会检查玩家当前 XUID 是否与历史记录匹配。 - 代理环境下因 XUID 不匹配导致玩家断开连接的问题，可通过在 pocketmine.yml 文件中禁用 player.verify-xuid 解决。 + 代理环境下因 XUID 不匹配导致玩家断开连接的问题，可通过在 pocketmine.yml 文件中禁用 player.verify-xuid 解决。 diff --git a/src/content/docs/general/advance/bot/general.mdx b/src/content/docs/general/advance/bot/general.mdx index bd82e71ab..959c237ac 100644 --- a/src/content/docs/general/advance/bot/general.mdx +++ b/src/content/docs/general/advance/bot/general.mdx @@ -38,13 +38,13 @@ import { TabItem, Tabs } from "@astrojs/starlight/components"; -| EasyBot | ![](https://img.shields.io/badge/状态-积极维护-green?style=for-the-badge) | -| -------- | ------------------------------------------------------------------------------------------- | -| 相关链接 | [文档站](https://docs.inectar.cn/docs/easybot/intor) | -| 作者 | [easybot-team](https://github.com/easybot-team/) | -| 支持平台 | Java 版 MCDR Fabric/Quilt NeoForge Forge | +| EasyBot | ![](https://img.shields.io/badge/状态-积极维护-green?style=for-the-badge) | +| -------- | ---------------------------------------------------------------------------------------------------------- | +| 相关链接 | [文档站](https://docs.inectar.cn/docs/easybot/intor) | +| 作者 | [easybot-team](https://github.com/easybot-team/) | +| 支持平台 | Java 版 MCDR Fabric/Quilt NeoForge Forge | | 介绍 | 基于 .NET8.0+React 开发的跨平台群服互通框架，使用 OneBot11 标准接入 QQ，支持自定义脚本，高级图片渲染等功能 | -| 下载 | [官网下载](https://docs.inectar.cn/download/easybot) | +| 下载 | [官网下载](https://docs.inectar.cn/download/easybot) | diff --git a/src/content/docs/general/advance/management/player-management/client-distribution.mdx b/src/content/docs/general/advance/management/player-management/client-distribution.mdx index 982b45049..0c7aaf6ca 100644 --- a/src/content/docs/general/advance/management/player-management/client-distribution.mdx +++ b/src/content/docs/general/advance/management/player-management/client-distribution.mdx @@ -38,6 +38,7 @@ import { FileTree } from "@astrojs/starlight/components"; 2. **解压至整合包目录，以 HMCL 为例，结构如下：** + {/* prettier-ignore */} - MyModpack - java @@ -45,7 +46,6 @@ import { FileTree } from "@astrojs/starlight/components"; - HMCL.exe - hmcl.json - .minecraft - 3. **调整启动器设置：** diff --git a/src/content/docs/java/advance/optimize/go.mdx b/src/content/docs/java/advance/optimize/go.mdx index 55e374d24..aee1f911c 100644 --- a/src/content/docs/java/advance/optimize/go.mdx +++ b/src/content/docs/java/advance/optimize/go.mdx @@ -4,8 +4,6 @@ title: 调服务端配置 import { TabItem, Tabs } from "@astrojs/starlight/components"; -{/* markdownlint-disable no-duplicate-heading */} - 没有适用于所有服务器的设置。你应该理解每个配置选项，并根据服务器的最佳参数与服务器硬件、玩家数量和服务器性质等调整参数。 所以参数因服而异，随着进入游戏后期，服务器工作量会随着机器或者玩家增加而逐渐增加， @@ -330,8 +328,9 @@ max-auto-save-chunks-per-tick: 24 推荐值： +{/* prettier-ignore */} - + ```yaml chunks: entity-per-chunk-save-limit: @@ -882,8 +881,9 @@ sensor: 推荐值： +{/* prettier-ignore */} - + ```yaml enabled: true items: @@ -916,7 +916,7 @@ sensor: scaffolding: 600 ``` - + ```yaml enabled: true items: diff --git a/src/content/docs/java/process/mobile-player/client/amethyst-ios.mdx b/src/content/docs/java/process/mobile-player/client/amethyst-ios.mdx index a30098049..756e25466 100644 --- a/src/content/docs/java/process/mobile-player/client/amethyst-ios.mdx +++ b/src/content/docs/java/process/mobile-player/client/amethyst-ios.mdx @@ -302,21 +302,21 @@ import { Steps } from "@astrojs/starlight/components"; 1. 使用下面的命令进行安装 - ```bash - curl -fsSL https://static.palera.in/scripts/install.sh | sudo bash" - ``` + ```bash + curl -fsSL https://static.palera.in/scripts/install.sh | sudo bash" + ``` 2. 使用下面的命令来使用 palera1n - ```bash - # Linux - sudo systemctl stop usbmuxd - sudo usbmuxd -f -p - # 将你的苹果设备连接到电脑，并且你需要使设备进入 DFU 模式（屏幕上会有英文提示） - sudo palera1n -l - # macOS - # 将你的苹果设备连接到电脑，并且你需要使设备进入 DFU 模式（屏幕上会有英文提示） - palera1n -l - ``` + ```bash + # Linux + sudo systemctl stop usbmuxd + sudo usbmuxd -f -p + # 将你的苹果设备连接到电脑，并且你需要使设备进入 DFU 模式（屏幕上会有英文提示） + sudo palera1n -l + # macOS + # 将你的苹果设备连接到电脑，并且你需要使设备进入 DFU 模式（屏幕上会有英文提示） + palera1n -l + ``` @@ -336,11 +336,11 @@ import { Steps } from "@astrojs/starlight/components"; 2. 打开 Dopamine，点击越狱按钮，选择包管理器为 Sideo，设置 root 密码 - ![](../_assets/amethyst-ios/Dopamine_1.png) + ![](../_assets/amethyst-ios/Dopamine_1.png) - ![](../_assets/amethyst-ios/Dopamine_2.png) + ![](../_assets/amethyst-ios/Dopamine_2.png) - ![](../_assets/amethyst-ios/Dopamine_3.png) + ![](../_assets/amethyst-ios/Dopamine_3.png) 3. 下载 Amethyst 最新的 [ipa 安装包](https://github.com/AngelAuraMC/Amethyst-iOS/actions)。**（需要使用 GitHub 账号才能继续下载）** diff --git a/src/content/docs/java/process/mobile-player/geyser/upgrade/extended/fix.mdx b/src/content/docs/java/process/mobile-player/geyser/upgrade/extended/fix.mdx index 74a14a697..fbf697c12 100644 --- a/src/content/docs/java/process/mobile-player/geyser/upgrade/extended/fix.mdx +++ b/src/content/docs/java/process/mobile-player/geyser/upgrade/extended/fix.mdx @@ -159,13 +159,13 @@ Broadcaster 通过模拟 Xbox Live 客户端，将你的 Geyser/基岩版服务 2. **安装扩展** + {/* prettier-ignore */} - 服务器根目录/ - plugins/ - Geyser-Spigot/ - extensions/ Geyser 扩展文件夹 - MCXboxBroadcastExtension.jar Xbox 直播扩展 - 3. **重启服务器** diff --git a/tsconfig.json b/tsconfig.json index 336b5bab1..6742c701b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -5,6 +5,8 @@ "compilerOptions": { "resolveJsonModule": true, "jsx": "preserve", + "jsxImportSource": "astro", + "baseUrl": ".", "paths": { "@components/*": ["./src/components/*"], "@layouts/*": ["./src/layouts/*"]