From 28228f9120c27a7c377c3fc26d9c41fc089c607b Mon Sep 17 00:00:00 2001 From: Joshua Castle <26531652+Kas-tle@users.noreply.github.com> Date: Sun, 10 Mar 2024 22:04:11 -0700 Subject: [PATCH] Initial deploy Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com> --- .github/CODEOWNERS | 4 --- .github/workflows/deploy.yml | 33 +++++++++++++++++++ docs/floodgate/commands.md | 2 +- docs/floodgate/faq.mdx | 2 +- docs/floodgate/index.md | 4 +-- docs/geyser/common-issues.md | 2 +- docs/geyser/extensions.md | 2 +- .../fixing-unable-to-connect-to-world.md | 18 +++++----- docs/geyser/global-api.md | 2 +- docs/geyser/setup/self/modded-servers.mdx | 2 +- docs/geyser/setup/self/paper-spigot.mdx | 2 +- docs/geyser/setup/self/proxy-servers.mdx | 2 +- docs/geyser/setup/self/standalone.mdx | 2 +- docs/geyser/setup/self/viaproxy.mdx | 2 +- docs/geyser/understanding-the-config.md | 2 +- docs/other/developer-guide.md | 2 +- docusaurus.config.ts | 2 +- src/css/custom.css | 8 ++--- 18 files changed, 61 insertions(+), 32 deletions(-) delete mode 100644 .github/CODEOWNERS create mode 100644 .github/workflows/deploy.yml diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS deleted file mode 100644 index 58c8c97..0000000 --- a/.github/CODEOWNERS +++ /dev/null @@ -1,4 +0,0 @@ -* @GeyserMC/WikiAdmin @GeyserMC/GeyserTeam -/_docs/ @GeyserMC/Moderators @GeyserMC/WikiAdmin @GeyserMC/Triage @GeyserMC/GeyserTeam -/_data/ @GeyserMC/Moderators @GeyserMC/WikiAdmin @GeyserMC/Triage @GeyserMC/GeyserTeam -*.md @GeyserMC/Moderators @GeyserMC/WikiAdmin @GeyserMC/Triage @GeyserMC/GeyserTeam diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000..a81fd7c --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,33 @@ +name: Deploy to GitHub Pages + +on: + push: + branches: + - master + +permissions: + contents: write + +jobs: + deploy: + name: Deploy to GitHub Pages + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + with: + fetch-depth: 0 + - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 + with: + node-version: 18 + cache: yarn + + - name: Install dependencies + run: yarn + - name: Build website + run: yarn build + + - name: Deploy to GitHub Pages + uses: peaceiris/actions-gh-pages@4eb285e828117bca26638192c3ed309c622e7bad + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: ./build \ No newline at end of file diff --git a/docs/floodgate/commands.md b/docs/floodgate/commands.md index 0477beb..46bd577 100644 --- a/docs/floodgate/commands.md +++ b/docs/floodgate/commands.md @@ -4,6 +4,6 @@ title: Commands | Command | Permission | Description | |:---:|:---:|:---:| -| `fwhitelist` | `floodgate.command.fwhitelist` | Whitelist command for Floodgate players. See [here](/floodgate/features/#whitelist-command) for details. | +| `fwhitelist` | `floodgate.command.fwhitelist` | Whitelist command for Floodgate players. See [here](/floodgate/features#whitelist-command) for details. | | `linkaccount` | `floodgate.command.linkaccount` | Link your account for local linking. | | `unlinkaccount` | `floodgate.command.unlinkaccount` | Unlink your account for local linking. | diff --git a/docs/floodgate/faq.mdx b/docs/floodgate/faq.mdx index 3b15379..34d7149 100644 --- a/docs/floodgate/faq.mdx +++ b/docs/floodgate/faq.mdx @@ -14,7 +14,7 @@ Here you can find answers to frequently asked questions about Floodgate - if you In your Floodgate config, change `username-prefix` to whichever prefix you desire - you can set it to `""` and there will be no prefix. - On some older Paper servers (or any forks that use them), you may need to also shut down your server and delete your `usercache.json` file located in the same folder as your server jar to prevent users who already joined from having the old prefix. See [this issue](/floodgate/issues/#prefix-is-not-changing-on-the-server-after-changing-it-in-the-config) for more information. + On some older Paper servers (or any forks that use them), you may need to also shut down your server and delete your `usercache.json` file located in the same folder as your server jar to prevent users who already joined from having the old prefix. See [this issue](/floodgate/issues#prefix-is-not-changing-on-the-server-after-changing-it-in-the-config) for more information. diff --git a/docs/floodgate/index.md b/docs/floodgate/index.md index 8e2ea6f..b423c6b 100644 --- a/docs/floodgate/index.md +++ b/docs/floodgate/index.md @@ -9,6 +9,6 @@ Floodgate is a hybrid mode plugin that allows Minecraft: Bedrock Accounts to joi This is something you install in addition to Geyser. Unlike Geyser, Floodgate can only be installed as a plugin on Spigot (including Paper and forks), Bungeecord, Velocity, and as a mod on Fabric servers, and can only be utilized on servers that have it installed. ## What has Floodgate 2.0 to offer? {#what-has-floodgate-20-to-offer} -Floodgate 2.0 is a rewrite of Floodgate 1.0, with various bugfixes and improvements. It also introduces new features: being able to [see Bedrock player skins on Java edition](/floodgate/features/#what-is-skin-uploading), -being able to [use Bedrock forms](/geyser/forms/), link your account once and login on every server that has [Global Linking](/floodgate/linking/#what-is-global-linking) enabled, +Floodgate 2.0 is a rewrite of Floodgate 1.0, with various bugfixes and improvements. It also introduces new features: being able to [see Bedrock player skins on Java edition](/floodgate/features#what-is-skin-uploading), +being able to [use Bedrock forms](/geyser/forms/), link your account once and login on every server that has [Global Linking](/floodgate/linking#what-is-global-linking) enabled, and the [Global Api](/geyser/global-api). diff --git a/docs/geyser/common-issues.md b/docs/geyser/common-issues.md index 6ef4e70..5c51d1d 100644 --- a/docs/geyser/common-issues.md +++ b/docs/geyser/common-issues.md @@ -19,7 +19,7 @@ To fix "Unable to connect to world" with no console errors, see [here](/geyser/f * *If using Windows 10, iOS, or Android*: try adding the server to the Servers list in-game. * *If using Xbox One*: try connecting with [BedrockConnect](/geyser/using-geyser-with-consoles/). -* *If using PS4*: [try using a LAN proxy.](/geyser/using-geyser-with-consoles/#playstation-4) +* *If using PS4*: [try using a LAN proxy.](/geyser/using-geyser-with-consoles#playstation-4) * *If using Nintendo Switch*: there is currently no way for local servers to show up in the Friends tab, but you can still connect using [BedrockConnect](/geyser/using-geyser-with-consoles/). *If the Geyser instance is locally hosted:* try using `localhost` or `0.0.0.0` as the IP address. diff --git a/docs/geyser/extensions.md b/docs/geyser/extensions.md index 54ffe30..613b75f 100644 --- a/docs/geyser/extensions.md +++ b/docs/geyser/extensions.md @@ -80,7 +80,7 @@ public void onPostInitialize(GeyserPostInitializeEvent event) { } ``` If you wish to register custom items, global resource packs (or soon, custom blocks and entities), you will need to subscribe to the event using the @Subscribe annotation, -and register them in the event. You can find an example for custom items [here](/geyser/custom-items/#geyser-extensions). For other events, see [here](/geyser/events) for documentation. +and register them in the event. You can find an example for custom items [here](/geyser/custom-items#geyser-extensions). For other events, see [here](/geyser/events) for documentation. To build your extension, run the Gradle build task, and install the extension. diff --git a/docs/geyser/fixing-unable-to-connect-to-world.md b/docs/geyser/fixing-unable-to-connect-to-world.md index c0f6186..9e61afe 100644 --- a/docs/geyser/fixing-unable-to-connect-to-world.md +++ b/docs/geyser/fixing-unable-to-connect-to-world.md @@ -2,7 +2,7 @@ title: Fixing 'Unable to Connect to World' --- -# Fixing 'Unable to Connect to World' errors +## Fixing 'Unable to Connect to World' errors {#fixing-unable-to-connect-to-world-errors} This is by far the most common error people get when attempting to set up Geyser. Here's some steps on how to solve it. Usually, this error is caused by improper configuration of Geyser, or issues with your network. @@ -52,12 +52,12 @@ You should be connecting with the Java server IP and the Bedrock port (set in th ### I'm using a hosting provider or VPS! {#im-using-a-hosting-provider-or-vps} Please read [this page on supported hosting providers](/geyser/supported-hosting-providers/) to see if there are extra configuration steps required for your hosting or server provider. -Some VPS/KVM providers may require further setup, such as OVH, SoYouStart, and Oracle Cloud. Please read this [note](/geyser/port-forwarding/#issues-with-specific-vpskvm-providers) for more information. +Some VPS/KVM providers may require further setup, such as OVH, SoYouStart, and Oracle Cloud. Please read this [note](/geyser/port-forwarding#issues-with-specific-vpskvm-providers) for more information. ### Issues using Docker or Pterodactyl {#issues-using-docker-or-pterodactyl} -Make sure you assign the port to pterodactyl, and on docker, to the docker compose file. See our [port-forwarding](/geyser/port-forwarding/#using-docker-or-pterodactyl) page for fixes. +Make sure you assign the port to pterodactyl, and on docker, to the docker compose file. See our [port-forwarding](/geyser/port-forwarding#using-docker-or-pterodactyl) page for fixes. -# Port forwarding issues +## Port forwarding issues {#port-forwarding-issues} Your server does need to be port forwarded to allow connections from outside the local network. See [our port-forwarding guide](/geyser/port-forwarding/) for more information. @@ -74,7 +74,7 @@ Historically, having a Bedrock port that is a lower number will cause issues. Se This is likely a firewall issue on your server. Try the following workaround: Attempt to connect to the Bedrock IP and port through a web browser - for example, `http://test.geysermc.org:19132`. It won't work, but then try connecting through Bedrock, and it should work. -Specific host fixes for OVH/SoYouStart can be found [here](/geyser/port-forwarding/#issues-with-specific-vpskvm-providers). +Specific host fixes for OVH/SoYouStart can be found [here](/geyser/port-forwarding#issues-with-specific-vpskvm-providers). ### Changing the `bedrock` `address` in the Geyser config. {#changing-the-bedrock-address-in-the-geyser-config} @@ -82,23 +82,23 @@ Except for a few specific hosting providers, you generally do not need to change However, in rare instances, it does fix issues - for example, when Windows has multiple network adapters (check by running `ipconfig` in cmd), it can help to set the `address` to the local IP of the adapter you want to use. -# Using a hosting provider or other location +## Using a hosting provider or other location {#using-a-hosting-provider-or-other-location} ### Pterodactyl {#pterodactyl} If you get this error while using the Pterodactyl Panel, try editing the Geyser config and changing the port to something besides `19132` (e.g. `25566`). -# Hosting Geyser on another computer on the same network +## Hosting Geyser on another computer on the same network {#hosting-geyser-on-another-computer-on-the-same-network} ### Can only connect from the same computer and not anywhere else {#can-only-connect-from-the-same-computer-and-not-anywhere-else} Your firewall is likely in the way. Try adding an exception to Java, or disable the firewall for testing purposes. -# As a last resort for troubleshooting... +## As a last resort for troubleshooting... {#as-a-last-resort-for-troubleshooting} Minecraft offers a vanilla Bedrock server [here](https://www.minecraft.net/download/server/bedrock). Downloading, running, and attempting to connect to it may help isolate if the issue is on Geyser's end, or your computer/network's end. -# Using Geyser on the same computer +## Using Geyser on the same computer {#using-geyser-on-the-same-computer} ### Windows 10/11 {#windows-1011} diff --git a/docs/geyser/global-api.md b/docs/geyser/global-api.md index 64aca7b..b33fbbf 100644 --- a/docs/geyser/global-api.md +++ b/docs/geyser/global-api.md @@ -2,7 +2,7 @@ title: Global API --- -The Global API is available for every server. It currently includes: [Global Linking](/floodgate/linking/#what-is-global-linking), [skin uploading](/floodgate/features/#what-is-skin-uploading), getting a xuid by gamertag, and getting a gamertag by xuid. +The Global API is available for every server. It currently includes: [Global Linking](/floodgate/linking#what-is-global-linking), [skin uploading](/floodgate/features#what-is-skin-uploading), getting a xuid by gamertag, and getting a gamertag by xuid. We don't store anything else than you can access by the Global API, except for some non-identifiable metrics. The source code of the Global API is available [here](https://github.com/GeyserMC/global_api) and the source code of the Global Linking server is available [here](https://github.com/GeyserMC/GlobalLinkServer). As a user of the API, you can get various info about Geyser (or specifically, Floodgate players) that joined any Geyser + Floodgate server before. This includes: diff --git a/docs/geyser/setup/self/modded-servers.mdx b/docs/geyser/setup/self/modded-servers.mdx index fda1b8a..5829ea9 100644 --- a/docs/geyser/setup/self/modded-servers.mdx +++ b/docs/geyser/setup/self/modded-servers.mdx @@ -32,7 +32,7 @@ Geyser only works with **server-side** mods. Mods that require a client-side ins **Connecting locally in the same network** On the same device as the server, you can connect using `localhost`, or `127.0.0.1` as the address. - Do note: When hosting and playing on the same Windows device, you will need the [loopback fix](/geyser/fixing-unable-to-connect-to-world/#Using-Geyser-on-the-same-computer). + Do note: When hosting and playing on the same Windows device, you will need the [loopback fix](/geyser/fixing-unable-to-connect-to-world#using-geyser-on-the-same-computer). Other devices in the same local network can use your local IPv4 to connect - it starts with `10.` or `192.168.`. **Connecting from a different network** diff --git a/docs/geyser/setup/self/paper-spigot.mdx b/docs/geyser/setup/self/paper-spigot.mdx index 9cf270a..ee552ab 100644 --- a/docs/geyser/setup/self/paper-spigot.mdx +++ b/docs/geyser/setup/self/paper-spigot.mdx @@ -28,7 +28,7 @@ See also our FAQ **Connecting locally in the same network** On the same device as the server, you can connect using `localhost`, or `127.0.0.1` as the address. - Do note: When hosting and playing on the same Windows device, you will need the [loopback fix](/geyser/fixing-unable-to-connect-to-world/#Using-Geyser-on-the-same-computer). + Do note: When hosting and playing on the same Windows device, you will need the [loopback fix](/geyser/fixing-unable-to-connect-to-world#using-geyser-on-the-same-computer). Other devices in the same local network can use your local IPv4 to connect - it starts with `10.` or `192.168.`. **Connecting from a different network** diff --git a/docs/geyser/setup/self/proxy-servers.mdx b/docs/geyser/setup/self/proxy-servers.mdx index b58282d..3a58256 100644 --- a/docs/geyser/setup/self/proxy-servers.mdx +++ b/docs/geyser/setup/self/proxy-servers.mdx @@ -28,7 +28,7 @@ import { Versions } from '../../../../src/components/Versions' **Connecting locally in the same network** On the same device as the server, you can connect using `localhost`, or `127.0.0.1` as the address. - Do note: When hosting and playing on the same Windows device, you will need the [loopback fix](/geyser/fixing-unable-to-connect-to-world/#Using-Geyser-on-the-same-computer). + Do note: When hosting and playing on the same Windows device, you will need the [loopback fix](/geyser/fixing-unable-to-connect-to-world#using-geyser-on-the-same-computer). Other devices in the same local network can use your local IPv4 to connect - it starts with `10.` or `192.168.`. **Connecting from a different network** diff --git a/docs/geyser/setup/self/standalone.mdx b/docs/geyser/setup/self/standalone.mdx index fca0806..7d78b58 100644 --- a/docs/geyser/setup/self/standalone.mdx +++ b/docs/geyser/setup/self/standalone.mdx @@ -53,7 +53,7 @@ set it to either `online` for an online mode server, or `offline` for an offline **Connecting locally in the same network** On the same device as the server, you can connect using `localhost`, or `127.0.0.1` as the address. - Do note: When hosting and playing on the same Windows device, you will need the [loopback fix](/geyser/fixing-unable-to-connect-to-world/#Using-Geyser-on-the-same-computer). + Do note: When hosting and playing on the same Windows device, you will need the [loopback fix](/geyser/fixing-unable-to-connect-to-world#using-geyser-on-the-same-computer). Other devices in the same local network can use your local IPv4 to connect - it starts with `10.` or `192.168.`. Alternatively, open Minecraft: Bedrock edition, and join the LAN-Server in the **Friends** tab. diff --git a/docs/geyser/setup/self/viaproxy.mdx b/docs/geyser/setup/self/viaproxy.mdx index 680b7c2..5975444 100644 --- a/docs/geyser/setup/self/viaproxy.mdx +++ b/docs/geyser/setup/self/viaproxy.mdx @@ -27,7 +27,7 @@ **Connecting locally in the same network** On the same device as the server, you can connect using `localhost`, or `127.0.0.1` as the address. - Do note: When hosting and playing on the same Windows device, you will need the [loopback fix](/geyser/fixing-unable-to-connect-to-world/#Using-Geyser-on-the-same-computer). + Do note: When hosting and playing on the same Windows device, you will need the [loopback fix](/geyser/fixing-unable-to-connect-to-world#using-geyser-on-the-same-computer). Other devices in the same local network can use your local IPv4 to connect - it starts with `10.` or `192.168.`. **Connecting from a different network** diff --git a/docs/geyser/understanding-the-config.md b/docs/geyser/understanding-the-config.md index c85215d..5143246 100644 --- a/docs/geyser/understanding-the-config.md +++ b/docs/geyser/understanding-the-config.md @@ -96,7 +96,7 @@ saved-user-logins: - `no-emotes` - emotes will NOT be sent to other Bedrock clients and offhand will be swapped. This effectively disables all emotes from being seen. - `emotes-and-offhand` - emotes will be sent to Bedrock clients and offhand will be swapped -**`default-locale`**: The default locale to send to players if their locale could not be found. Check [this](/geyser/faq/#what-languages-does-geyser-support) page to find the code corresponding to your language. This option is disabled by default - to enable it, remove the "#" in front of the option. +**`default-locale`**: The default locale to send to players if their locale could not be found. This option is disabled by default - to enable it, remove the "#" in front of the option. **`cache-images`**: Specify how many days images will be cached to disk to save downloading them from the internet. A value of 0 is disabled. (Default: 0) diff --git a/docs/other/developer-guide.md b/docs/other/developer-guide.md index 555a1b5..29a5458 100644 --- a/docs/other/developer-guide.md +++ b/docs/other/developer-guide.md @@ -55,4 +55,4 @@ NBTExplorer is a tool for viewing and editing NBT data for Java edition, this al ## Windows 10 Multi-Version Launcher {#windows-10-multi-version-launcher} The Windows 10 Multi-Version launcher allows you to switch between release and beta versions of Minecraft Bedrock. Its GitHub repository can be viewed [here](https://github.com/MCMrARM/mc-w10-version-launcher/). Alternatively, use FoxyNoTail's Version Switcher, found [here](https://foxynotail.com/software/mcbe-switcher). -Note: To apply the [loopback fix](/geyser/fixing-unable-to-connect-to-world/#windows-1011) for Minecraft Preview, use the following loopback restriction lifting command with the different app ID: `CheckNetIsolation LoopbackExempt -a -n="Microsoft.MinecraftWindowsBeta_8wekyb3d8bbwe"` +Note: To apply the [loopback fix](/geyser/fixing-unable-to-connect-to-world#windows-1011) for Minecraft Preview, use the following loopback restriction lifting command with the different app ID: `CheckNetIsolation LoopbackExempt -a -n="Microsoft.MinecraftWindowsBeta_8wekyb3d8bbwe"` diff --git a/docusaurus.config.ts b/docusaurus.config.ts index c3dd5dc..1c91474 100644 --- a/docusaurus.config.ts +++ b/docusaurus.config.ts @@ -8,7 +8,7 @@ const config: Config = { favicon: 'img/favicon.ico', // TODO: Change to correct domain in production! - url: 'https://chew-geyserwiki.pages.dev', + url: 'https://dev.geysermc.org', // Set the // pathname under which your site is served // For GitHub pages deployment, it is often '//' baseUrl: '/', diff --git a/src/css/custom.css b/src/css/custom.css index 1cfeda6..f0ca170 100644 --- a/src/css/custom.css +++ b/src/css/custom.css @@ -240,11 +240,11 @@ html[data-theme='dark'] { background-color: var(--ifm-background-color); font-size: 16px; color: var(--ifm-font-color-base); +} - &:focus { - border-radius: var(--ifm-global-radius); - border: 1px solid var(--ifm-tabs-color-active); - } +.host-select select:focus { + border-radius: var(--ifm-global-radius); + border: 1px solid var(--ifm-tabs-color-active); } .inner {