Skip to content

Commit bfade4e

Browse files
committed
Merge branch 'main' into feature/adventure-5
2 parents df70adf + 2f8f228 commit bfade4e

File tree

88 files changed

+2781
-2184
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+2781
-2184
lines changed

.github/workflows/build-preview.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ jobs:
2525
run: "pnpm build"
2626
env:
2727
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
28-
- name: "copy cloudflare configuration files to build directory"
29-
run: |
30-
cp _headers dist/
31-
cp _redirects dist/
3228
- name: "upload build artifact"
3329
uses: "actions/upload-artifact@v4"
3430
with:

.github/workflows/deploy.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ jobs:
2828
run: "pnpm build"
2929
env:
3030
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
31-
- name: "copy cloudflare configuration files to build directory"
32-
run: |
33-
cp _headers dist/
34-
cp _redirects dist/
3531
- name: "publish (push)"
3632
id: "cloudflare-publish"
3733
uses: "AdrianGonz97/refined-cf-pages-action@v1"

.github/workflows/spellcheck.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ jobs:
1414
- name: Checkout repository
1515
uses: actions/checkout@v4
1616
- name: Spell check
17-
uses: crate-ci/typos@v1.32.0
17+
uses: crate-ci/typos@v1.38.1

CONTRIBUTING.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,10 @@ For that, you can use the `jd:project_name[:module_name][:class_or_member_refere
180180
[`repeat(long, TimeUnit)`](jd:velocity:com.velocitypowered.api.scheduler.Scheduler$TaskBuilder#repeat(long,java.util.concurrent.TimeUnit))
181181
[java.base's List](jd:java:java.util.List)
182182
[java.sql's Connection](jd:java:java.sql:java.sql.Connection)
183+
184+
We don't even need to specify the link text, it can be generated automatically:
185+
[](jd:paper:org.bukkit.event.Event) looks like `Event`
186+
[](jd:velocity:com.velocitypowered.api.scheduler.Scheduler$TaskBuilder#repeat(long,java.util.concurrent.TimeUnit)) looks like `Scheduler.TaskBuilder#repeat(long, TimeUnit)`
183187
```
184188

185189
## Referencing a build system dependency

_headers

Lines changed: 0 additions & 2 deletions
This file was deleted.

astro.config.ts

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,30 +41,30 @@ export default defineConfig({
4141
title: "PaperMC Docs",
4242
social: [
4343
{ icon: "github", label: "paper:GitHub", href: "https://github.com/PaperMC/Paper" },
44-
{ icon: "seti:java", label: "paper:Javadoc", href: `https://jd.papermc.io/paper/${LATEST_PAPER_RELEASE}` },
44+
{ icon: "seti:java", label: "paper:Javadoc", href: `https://jd.papermc.io/paper` },
4545

4646
{ icon: "github", label: "velocity:GitHub", href: "https://github.com/PaperMC/Velocity" },
4747
{
4848
icon: "seti:java",
4949
label: "velocity:Javadoc",
50-
href: `https://jd.papermc.io/velocity/${LATEST_VELOCITY_RELEASE.substring(0, LATEST_VELOCITY_RELEASE.lastIndexOf("."))}.0`,
50+
href: `https://jd.papermc.io/velocity`,
5151
},
5252

5353
{ icon: "github", label: "folia:GitHub", href: "https://github.com/PaperMC/Folia" },
5454
{
5555
icon: "seti:java",
5656
label: "folia:Javadoc",
57-
href: `https://jd.papermc.io/folia/${LATEST_FOLIA_RELEASE.split(".").slice(0, 2).join(".")}`,
57+
href: `https://jd.papermc.io/folia`,
5858
},
5959

60-
{ icon: "github", label: "adventure:GitHub", href: "https://github.com/KyoriPowered/adventure" },
60+
{ icon: "github", label: "adventure:GitHub", href: "https://github.com/PaperMC/adventure" },
6161
{ icon: "seti:java", label: "adventure:Javadoc", href: "https://jd.advntr.dev" },
6262

6363
{ icon: "github", label: "waterfall:GitHub", href: "https://github.com/PaperMC/Waterfall" },
6464
{
6565
icon: "seti:java",
6666
label: "waterfall:Javadoc",
67-
href: `https://jd.papermc.io/waterfall/${LATEST_WATERFALL_RELEASE}`,
67+
href: `https://jd.papermc.io/waterfall`,
6868
},
6969

7070
{ icon: "github", label: "GitHub", href: "https://github.com/PaperMC" },
@@ -149,13 +149,15 @@ export default defineConfig({
149149
],
150150
},
151151
"paper/reference/paper-plugins",
152+
"paper/reference/commands",
152153
"paper/reference/system-properties",
154+
"paper/reference/cli-arguments",
153155
"paper/reference/permissions",
154156
],
155157
},
156158
{
157159
label: "Miscellaneous",
158-
items: ["paper/misc/paper-bug-fixes", "paper/faq"],
160+
items: ["paper/misc/update-checker", "paper/misc/paper-bug-fixes", "paper/faq"],
159161
},
160162
],
161163
},
@@ -539,16 +541,17 @@ export default defineConfig({
539541
image: {
540542
responsiveStyles: true,
541543
layout: "constrained",
544+
domains: ["assets.papermc.io"],
542545
},
543546
markdown: {
544547
remarkPlugins: [
545548
[
546549
javadocPlugin,
547550
{
548551
targets: {
549-
paper: `https://jd.papermc.io/paper/${LATEST_PAPER_RELEASE}`,
550-
velocity: `https://jd.papermc.io/velocity/${LATEST_VELOCITY_RELEASE.substring(0, LATEST_VELOCITY_RELEASE.lastIndexOf("."))}.0`,
551-
java: { url: "https://docs.oracle.com/en/java/javase/21/docs/api", module: "java.base" },
552+
paper: "https://jd.papermc.io/paper",
553+
velocity: "https://jd.papermc.io/velocity",
554+
java: { url: "https://docs.oracle.com/en/java/javase/25/docs/api", module: "java.base" },
552555
},
553556
},
554557
],

package.json

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,37 +12,37 @@
1212
"format:check": "prettier . --check"
1313
},
1414
"dependencies": {
15-
"@astrojs/markdown-remark": "^6.3.6",
16-
"@astrojs/starlight": "^0.36.0",
17-
"@astrojs/svelte": "^7.1.1",
18-
"@expressive-code/plugin-collapsible-sections": "^0.41.3",
19-
"@expressive-code/plugin-line-numbers": "^0.41.3",
15+
"@ascorbic/feed-loader": "^2.0.1",
16+
"@astrojs/markdown-remark": "^6.3.10",
17+
"@astrojs/starlight": "^0.37.1",
18+
"@astrojs/svelte": "^7.2.4",
19+
"@expressive-code/plugin-collapsible-sections": "^0.41.5",
20+
"@expressive-code/plugin-line-numbers": "^0.41.5",
2021
"@fontsource/jetbrains-mono": "^5.2.8",
2122
"@fontsource/poppins": "^5.2.7",
22-
"astro": "^5.13.9",
23-
"@ascorbic/feed-loader": "^1.0.4",
24-
"astro-d2": "^0.8.0",
25-
"sharp": "^0.34.4",
26-
"starlight-contributor-list": "^0.3.0",
27-
"starlight-links-validator": "^0.18.0",
28-
"starlight-sidebar-topics": "^0.6.1",
29-
"starlight-sidebar-topics-dropdown": "^0.5.1",
30-
"svelte": "^5.39.3",
31-
"typescript": "^5.9.2",
23+
"astro": "^5.16.6",
24+
"astro-d2": "^0.8.1",
25+
"sharp": "^0.34.5",
26+
"starlight-contributor-list": "^0.3.1",
27+
"starlight-links-validator": "^0.19.2",
28+
"starlight-sidebar-topics": "^0.6.2",
29+
"starlight-sidebar-topics-dropdown": "^0.5.2",
30+
"svelte": "^5.46.0",
31+
"typescript": "^5.9.3",
3232
"unist-util-visit": "^5.0.0",
33-
"yaml": "^2.8.1"
33+
"yaml": "^2.8.2"
3434
},
3535
"devDependencies": {
3636
"@types/mdast": "^4.0.4",
37-
"@types/node": "^24.5.2",
37+
"@types/node": "^25.0.3",
3838
"dead-or-alive": "^1.0.4",
39-
"prettier": "3.6.2",
39+
"prettier": "3.7.4",
4040
"prettier-plugin-astro": "0.14.1",
4141
"prettier-plugin-organize-imports": "^4.3.0",
42-
"prettier-plugin-svelte": "^3.4.0"
42+
"prettier-plugin-svelte": "^3.4.1"
4343
},
4444
"engines": {
4545
"node": ">=22.x"
4646
},
47-
"packageManager": "pnpm@10.17.0+sha512.fce8a3dd29a4ed2ec566fb53efbb04d8c44a0f05bc6f24a73046910fb9c3ce7afa35a0980500668fa3573345bd644644fa98338fa168235c80f4aa17aa17fbef"
47+
"packageManager": "pnpm@10.26.1+sha512.664074abc367d2c9324fdc18037097ce0a8f126034160f709928e9e9f95d98714347044e5c3164d65bd5da6c59c6be362b107546292a8eecb7999196e5ce58fa"
4848
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/components/Icons.ts b/components/Icons.ts
2-
index 41316b960537d689ae86ee7c056f363d6cc39214..c179bb0d181cf84d81ba333a29b39eeafd86db6f 100644
2+
index 413477d5343737363d99a68a3beb98f0991a469f..a171bd687cd85a1bf0644f328e887b044986764d 100644
33
--- a/components/Icons.ts
44
+++ b/components/Icons.ts
55
@@ -193,6 +193,11 @@ export const BuiltInIcons = {

0 commit comments

Comments
 (0)