diff --git a/src/components/Provider.tsx b/src/components/Provider.tsx index 2f45ea4..060b55d 100644 --- a/src/components/Provider.tsx +++ b/src/components/Provider.tsx @@ -1,8 +1,7 @@ import type { HostingProvider, ProviderType } from "@site/src/types/providers"; import ReactMarkdown from "react-markdown"; -import Admonition from '@theme/Admonition'; import React, { useState } from 'react'; -import Translate, { translate } from "@docusaurus/Translate"; +import { translate } from "@docusaurus/Translate"; import { providersData } from "../data/providers"; export const noP = (props: { children: any; }) => { @@ -29,7 +28,7 @@ export const Provider = ({ type }) => { ) } -export const ProviderSelector = () => { +export const ProviderSelector = ({setProvider}) => { const providers: HostingProvider[] = [ ...Object.values(providersData.built_in), ...Object.values(providersData.support), @@ -51,6 +50,7 @@ export const ProviderSelector = () => { const selectedName = event.target.value; const provider = providers.find(p => p.name === selectedName); setSelectedProvider(provider); + setProvider(provider); } return ( @@ -63,15 +63,6 @@ export const ProviderSelector = () => { ))} - Provider Instructions}> - {selectedProvider ? ( - {selectedProvider.description} - ) : ( -

- Select a provider to see specific installation instructions -

- )} -
); } diff --git a/wiki/geyser/setup.mdx b/wiki/geyser/setup.mdx index 7f3e190..5bae476 100644 --- a/wiki/geyser/setup.mdx +++ b/wiki/geyser/setup.mdx @@ -4,60 +4,76 @@ page_sidebar: false description: Guides to setup Geyser on all supported platforms --- -import Tabs from "@theme/Tabs"; -import TabItem from "@theme/TabItem"; +import Tabs from '@theme/Tabs' +import TabItem from '@theme/TabItem' +import Admonition from '@theme/Admonition'; +import Translate from "@docusaurus/Translate"; -import ModdedServers from './setup/provider/modded-servers.mdx'; -import ProxyServers from './setup/provider/proxy-servers.mdx'; -import PaperSpigot from './setup/provider/paper-spigot.mdx'; +import ModdedServers from '@site/wiki/geyser/setup/provider/modded-servers.mdx' +import ProxyServers from '@site/wiki/geyser/setup/provider/proxy-servers.mdx' +import PaperSpigot from '@site/wiki/geyser/setup/provider/paper-spigot.mdx' -import ModdedServersSelf from './setup/self/modded-servers.mdx'; -import ProxyServersSelf from './setup/self/proxy-servers.mdx'; -import PaperSpigotSelf from './setup/self/paper-spigot.mdx'; -import ViaProxy from './setup/self/viaproxy.mdx'; -import Standalone from './setup/self/standalone.mdx'; +import ModdedServersSelf from '@site/wiki/geyser/setup/self/modded-servers.mdx' +import ProxyServersSelf from '@site/wiki/geyser/setup/self/proxy-servers.mdx' +import PaperSpigotSelf from '@site/wiki/geyser/setup/self/paper-spigot.mdx' +import ViaProxy from '@site/wiki/geyser/setup/self/viaproxy.mdx' +import Standalone from '@site/wiki/geyser/setup/self/standalone.mdx' import PlatformIcon from '@site/src/components/PlatformIcon' -import ModIcon from '@site/static/img/icons/fabric.png'; -import ProxyServersIcon from '@site/static/img/icons/velocity.png'; -import PaperSpigotIcon from '@site/static/img/icons/paper.png'; -import ViaProxyIcon from '@site/static/img/icons/viaproxy.png'; -import StandaloneIcon from '@site/static/img/icons/geyser.png'; +import ModIcon from '@site/static/img/icons/fabric.png' +import ProxyServersIcon from '@site/static/img/icons/velocity.png' +import PaperSpigotIcon from '@site/static/img/icons/paper.png' +import ViaProxyIcon from '@site/static/img/icons/viaproxy.png' +import StandaloneIcon from '@site/static/img/icons/geyser.png' -import { ProviderSelector } from "@site/src/components/Provider"; +import { ProviderSelector } from '@site/src/components/Provider' +import { useState } from 'react' - - - - - } default> - +export const SetupGuide = () => { + const [provider, setProvider] = useState(null) + return ( + + + + {provider ? ( + <> + {provider.connect_instructions ? ( + + } default> + + + }> + + + }> + + + + ) : (Not supported}>{provider.warn})} + + ) : null} - }> - - - }> - + + + } default> + + + }> + + + }> + + + }> + + + }> + + + - - - - } default> - - - }> - - - }> - - - }> - - - }> - - - - - \ No newline at end of file + ) +} + + \ No newline at end of file diff --git a/wiki/geyser/setup/provider/paper-spigot.mdx b/wiki/geyser/setup/provider/paper-spigot.mdx index 6104a4f..c343b63 100644 --- a/wiki/geyser/setup/provider/paper-spigot.mdx +++ b/wiki/geyser/setup/provider/paper-spigot.mdx @@ -4,6 +4,8 @@ description: Learn how to set up Geyser on a Paper or Spigot server from a hosti hide_title: true --- +import Admonition from '@theme/Admonition'; + import { Versions } from '@site/src/components/Versions' :::info @@ -11,32 +13,60 @@ If your server is not running , you will need to inst See also [this page](/wiki/geyser/supported-versions/) on supported versions. ::: -1. Select your server hosting provider in the dropdown above. -2. Download the plugin from [the download page](/download). -3. Place the Geyser-Spigot.jar in the `plugins` folder, and restart the server. -4. Open your Geyser config, located in `/plugins/Geyser-Spigot/config.yml`, and find the following: +{props.provider.warn ? {props.provider.warn} : null} - ```yaml - bedrock: - # The IP address that will listen for connections. - # Generally, you should only uncomment and change this if you want to limit what IPs can connect to your server. - #address: 0.0.0.0 - # The port that will listen for connections. This is the port that Bedrock players will use to connect to your server. - port: 19132 +

Install:

+{props.provider.custom_install_location ? props.provider.custom_install_location : ( +
    +
  1. Download the plugin from [the download page](/download).
  2. +
  3. Place the Geyser-Spigot.jar in the `plugins` folder, and restart the server.
  4. +
+)} +
- # Some hosting services change your Java port everytime you start the server and require the same port to be used for Bedrock. - # This option makes the Bedrock port the same as the Java port every time you start the server. - # This option is for the plugin version only. - clone-remote-port: false - ``` - The vital part is the port. This is the port that Bedrock players will use to connect to your server. - Follow the instructions in the provider selector - change the port, and if necessary, `clone-remote-port` & `address`. - If `clone-remote-port` is enabled, the bedrock port will be overwritten with the Java port! - **Important**: Other services/plugins that rely on ports with UDP, such as Voice Chats or Query, cannot share the port with Geyser. - -5. Verify whether connections are possible by running `geyser connectiontest ` in the console. +{props.provider.config ? ( + <> +

Make the following config changes:

+ Open your Geyser config, located in `/plugins/Geyser-Spigot/config.yml` +
    + {props.provider.config.address ?
  • Change the `address` to `{props.provider.config.address}`
  • : null} + {props.provider.config.port ?
  • Change the `port` to `{props.provider.config.port}`
  • : null} + {props.provider.config.clone_remote_port ?
  • Change `clone-remote-port` to `{props.provider.config.clone_remote_port}`
  • : null} + {props.provider.config.port_instruction ?
  • {props.provider.config.port_instruction}
  • : null} + {props.provider.config.address_instruction ?
  • {props.provider.config.address_instruction}
  • : null} + {props.provider.config.other_instructions ?
  • {props.provider.config.other_instructions}
  • : null} +
+ +) : null} -:::info -To allow Bedrock Edition players to join your server without needing to log in to a paid Java Edition account, you can use Floodgate. -::: +{props.provider.additional_step ? ( + <> +

Additional Steps:

+ {props.provider.additional_step} +
+ +) : null} + + +{props.provider.connect_instructions ? ( + + {props.provider.connect_instructions} +
+
+
+) : (
Nope
)} + + +{props.provider.info ? {props.provider.info} : null} + + +{props.provider.hosting_article || props.provider.hosting_support ? ( + <> +

More Information:

+ + +) : null}