Merge remote-tracking branch 'upstream/master' into feat/docuasaurus

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

_data/providers.json

@@ -384,6 +384,11 @@
             "url": "https://ultimatesrv.com/",
             "description_template": "default"
         },
+        {
+            "name": "VexyHost",
+            "url": "https://vexyhost.com/",
+            "description_template": "default"
+        },
         {
             "name": "Volcano Hosting",
             "url": "https://www.volcanohosting.net/",

_data/versions.json

@@ -1,4 +1,4 @@
 {
-    "bedrock": "1.20.40-1.20.51",
+    "bedrock": "1.20.40-1.20.62",
     "java": "1.20.4"
-}
+}

docs/floodgate/linking.md

@@ -42,7 +42,7 @@ You can also set up a local linking database on your server. Local linking can w
 
 Note that you only have to follow these steps on your proxy (BungeeCord or Velocity), if you have one.
 
-1. Download one of the linking databases extensions [here](https://ci.opencollab.dev/job/GeyserMC/job/Floodgate/job/master/).
+1. Download one of the linking databases extensions [here](https://ci.opencollab.dev/job/GeyserMC/job/Floodgate/job/old%252F2.1/).
    If you need help picking the right one: choose `mysql` if you already have a database or want to have a multi-proxy setup. For anything else choose `sqlite`. The full name should be `floodgate-*type*-database.jar`.
 2. Copy the database extension jar you just downloaded *into* the floodgate 2.0 plugin folder (e.g. `/plugins/floodgate/`).
 3. Enable `enable-own-linking` in the `player-link` section of Floodgate.

docs/floodgate/setup.mdx

@@ -9,12 +9,14 @@ import TabItem from "@theme/TabItem";
 import Fabric from './setup/fabric.mdx';
 import ProxyServers from './setup/proxy-servers.mdx';
 import PaperSpigot from './setup/paper-spigot.mdx';
+import ViaProxy from './setup/viaproxy.mdx';
 import Standalone from './setup/standalone.mdx';
 
 import PlatformIcon from '../../src/components/PlatformIcon'
 import FabricIcon 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';
 
 <Tabs>
@@ -27,6 +29,9 @@ import StandaloneIcon from '@site/static/img/icons/geyser.png';
     <TabItem value="proxy-servers" label={<PlatformIcon img={ProxyServersIcon} text="Proxy Servers"/>}>
         <ProxyServers/>
     </TabItem>
+    <TabItem value="viaproxy" label={<PlatformIcon img={ViaProxyIcon} text="ViaProxy"/>}>
+        <ViaProxy/>
+    </TabItem>
     <TabItem value="standalone" label={<PlatformIcon img={StandaloneIcon} text="Standalone"/>}>
         <Standalone/>
     </TabItem>

docs/floodgate/setup/proxy-servers.mdx

@@ -3,7 +3,7 @@ You only need to install Floodgate on the BungeeCord or Velocity proxy server, u
 Additionally, it will display Bedrock edition skins properly.
 :::
 
-1. Download Floodgate for your proxy software from the [download page](https://geysermc.org/download). 
+1. Download Floodgate for your proxy software from the [download page](https://geysermc.org/download#floodgate). 
 2. Place the Floodgate jar in the `plugins` folder, and restart the proxy server.
 3. Change `auth-type` in Geyser's config to `floodgate`.
 4. Restart the server.

docs/floodgate/setup/standalone.mdx

@@ -2,7 +2,7 @@
 To be able to use Floodgate authentication, you need to be able to install Floodgate on the Java server you are connecting to.
 :::
 
-1. Download and install the platform-specific Floodgate jar (e.g. floodgate-spigot, or floodgate-fabric) [here](https://geysermc.org/download). 
+1. Download and install the platform-specific Floodgate jar (e.g. floodgate-spigot, or floodgate-fabric) [here](https://geysermc.org/download#floodgate). 
 See the platform setup instructions for a detailed, platform specific setup guide. Then, continue with the instructions below.
 2. Change `auth-type` in Geyser Standalone's config to `floodgate`.
 3. Copy the `key.pem` file in the Floodgate config folder to the same directory as Geyser Standalone. 

docs/floodgate/setup/viaproxy.mdx

@@ -0,0 +1,12 @@
+:::info
+To be able to use Floodgate authentication, you need to be able to install Floodgate on the Java server you are connecting to.
+:::
+
+1. Download and install the platform-specific Floodgate jar (e.g. floodgate-spigot, or floodgate-fabric) [here](https://geysermc.org/download#floodgate). 
+See the platform setup instructions for a detailed, platform specific setup guide. Then, continue with the instructions below.
+2. Copy the `key.pem` file in the Floodgate config folder to the `/plugins/Geyser/´ directory.
+3. Restart ViaProxy.
+
+:::danger
+DO NOT DISTRIBUTE THIS KEY TO ANYBODY! This key is what allows for Bedrock accounts to bypass the Java Edition authentication, and if anyone gets ahold of this, they can wreak havoc on your server.
+:::

docs/geyser/api.md

@@ -7,7 +7,7 @@ Geyser has an API to extend what is possible with Geyser, and to allow you to in
 ### Where can I use the Geyser API?
 You could use the Geyser API in:
 - A plugin for Paper/Spigot, Velocity, Waterfall/BungeeCord, etc.
-- A mod for Fabric or Forge
+- A mod for Fabric or NeoForge
 - A Geyser Extension
 
 ### Accessing the Geyser API

docs/geyser/faq.mdx

@@ -42,7 +42,7 @@ Here you can find answers to frequently asked questions about Geyser - if you ha
             * [ExploitFixer](https://www.spigotmc.org/resources/62842/) thinks that Floodgate users are UUID spoofing - disable the `uuidspoof` setting in ExploitFixer's config.
             * [JPremium](https://www.spigotmc.org/resources/27766/) alters the UUID of a player, causing Floodgate not to be able to get the Bedrock data from its map.
             * [LibHatesMods](https://www.spigotmc.org/resources/78202/) causes authentication to fail with `com.github.steveice10.mc.auth.exception.request.InvalidCredentialsException`
-            * [ProtocolSupport](https://www.spigotmc.org/resources/7201/) ~~is currently incompatible with Floodgate.~~ Works with Floodgate, but we recommend using [ViaBackwards](https://www.spigotmc.org/resources/27448/) instead.
+            * [ProtocolSupport](https://www.spigotmc.org/resources/7201/) ~~is currently incompatible with Floodgate.~~ Works with Floodgate, but we recommend using [ViaBackwards](https://hangar.papermc.io/ViaVersion/ViaBackwards) instead.
             * [ProtocolSupportBungee](https://www.spigotmc.org/resources/8733/) changes how the login process works and therefore breaks the Floodgate injection code.
             * [SayNoToMcLeaks](https://www.spigotmc.org/resources/40906/) prevents Floodgate from finishing its login system.
 
@@ -53,7 +53,7 @@ Here you can find answers to frequently asked questions about Geyser - if you ha
         What server versions does Geyser support?
         <A>
             The Geyser-Spigot plugin supports any Minecraft server version 1.16.5 or later. Any earlier version is not supported by the plugin - use a proxy version or the standalone build instead.
-            Since Geyser emulates a <Versions platform="java"/> Java Edition client, you need to [install ViaVersion](https://www.spigotmc.org/resources/viaversion.19254/) on your server
+            Since Geyser emulates a <Versions platform="java"/> Java Edition client, you need to [install ViaVersion](https://viaversion.com/) on your server
             if it is not running the latest version of Minecraft.   
 
             In order for Bedrock players to chat (1.19.3+) or join (1.19.1/1.19.2), you need to disable chat signing. More information about that can be read on the [chat signing page](/geyser/secure-chat/).   
@@ -76,12 +76,14 @@ Here you can find answers to frequently asked questions about Geyser - if you ha
             * Any other forks of the above
             * Geyser-Velocity works with [Velocity](https://www.velocitypowered.com/)
             * Geyser-Fabric works with [Fabric](https://www.fabricmc.net/), and requires FabricAPI to be installed on the server as well.
+            * Geyser-NeoForge works with [NeoForge](https://neoforged.net/),
+            * Geyser-ViaProxy works with [ViaProxy](https://github.com/ViaVersion/ViaProxy).
         </A>
     </Q>
     <Q>
         Which type of Geyser version is better, standalone or plugin?
         <A>
-            Because of optimizations that hook into the plugin platforms, plugin versions of Geyser are preferable compared to standalone Geyser. On Spigot, Velocity, and BungeeCord versions of Geyser, direct connections allow for faster loading times, lower latency, and accurate IP addresses without requiring Floodgate. Geyser-Spigot has further optimizations due to having direct world access, including lower memory usage and greater translation accuracy. However, large server networks might prefer standalone Geyser because it can be updated without needing to restart any other proxies or servers, and can offload resource usage onto seperate machines.
+            Because of optimizations that hook into the plugin platforms, plugin versions of Geyser are preferable compared to standalone Geyser. On Spigot, Velocity, Fabric/NeoForge and BungeeCord versions of Geyser, direct connections allow for faster loading times, lower latency, and accurate IP addresses without requiring Floodgate. Geyser on Spigot, Fabric and NeoForge has further optimizations due to having direct world access, including lower memory usage and greater translation accuracy. However, large server networks might prefer standalone Geyser because it can be updated without needing to restart any other proxies or servers, and can offload resource usage onto seperate machines.
         </A>
     </Q>
     <Q>
@@ -193,7 +195,7 @@ Here you can find answers to frequently asked questions about Geyser - if you ha
         </A>
     </Q>
     <Q>
-        Can I connect Geyser to a modded (Forge/Fabric) server?
+        Can I connect Geyser to a modded (Forge/Fabric/NeoForge) server?
         <A>
             The short answer: if a vanilla client can join the server, then so can Geyser.
 

docs/geyser/playit-gg.md

@@ -5,9 +5,11 @@ title: playit.gg Setup
 ## Prerequisites
 
 :::info
-
 You must be able to connect to your Geyser instance locally!
+:::
 
+:::warning
+The playit.gg Minecraft server plugin does not support UDP tunnels. You will need to use the program agent instead!
 :::
 
 - If you already have playit.gg running & set up (for e.g. Minecraft Java edition), skip steps 1 and 2 and proceed with step 3.

docs/geyser/secure-chat.md

@@ -13,7 +13,7 @@ For a technical explanation of Java's chat signing system, see this [article](ht
 
 # Disabling
 
-*Vanilla, Spigot/Paper/forks, Fabric*
+*Vanilla, Spigot/Paper/forks, Fabric, NeoForge*
 
 Set `enforce-secure-profile: false` in [server.properties](https://minecraft.fandom.com/wiki/Server.properties)
 

docs/geyser/setup.mdx

@@ -6,19 +6,21 @@ page_sidebar: false
 import Tabs from "@theme/Tabs";
 import TabItem from "@theme/TabItem";
 
-import Fabric from './setup/provider/fabric.mdx';
+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 FabricSelf from './setup/self/fabric.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 PlatformIcon from '../../src/components/PlatformIcon'
-import FabricIcon from '@site/static/img/icons/fabric.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 "../../src/components/Provider";
@@ -30,8 +32,8 @@ import { ProviderSelector } from "../../src/components/Provider";
             <TabItem value="paper-spigot" label={<PlatformIcon img={PaperSpigotIcon} text="Paper / Spigot"/>} default>
                 <PaperSpigot/>
             </TabItem>
-            <TabItem value="fabric" label={<PlatformIcon img={FabricIcon} text="Fabric"/>}>
-                <Fabric/>
+            <TabItem value="modded-servers" label={<PlatformIcon img={ModIcon} text="Modded Servers"/>}>
+                <ModdedServers/>
             </TabItem>
             <TabItem value="proxy-servers" label={<PlatformIcon img={ProxyServersIcon} text="Proxy Servers"/>}>
                 <ProxyServers/>
@@ -43,12 +45,15 @@ import { ProviderSelector } from "../../src/components/Provider";
             <TabItem value="paper-spigot-self" label={<PlatformIcon img={PaperSpigotIcon} text="Paper / Spigot"/>} default>
                 <PaperSpigotSelf/>
             </TabItem>
-            <TabItem value="fabric-self" label={<PlatformIcon img={FabricIcon} text="Fabric"/>}>
-                <FabricSelf/>
+            <TabItem value="modded-servers-self" label={<PlatformIcon img={ModIcon} text="Modded Servers"/>}>
+                <ModdedServersSelf/>
             </TabItem>
             <TabItem value="proxy-servers-self" label={<PlatformIcon img={ProxyServersIcon} text="Proxy Servers"/>}>
                 <ProxyServersSelf/>
             </TabItem>
+            <TabItem value="viaproxy" label={<PlatformIcon img={ViaProxyIcon} text="ViaProxy"/>}>
+                <ViaProxy/>
+            </TabItem>
             <TabItem value="standalone" label={<PlatformIcon img={StandaloneIcon} text="Standalone"/>}>
                 <Standalone/>
             </TabItem>

docs/geyser/setup/provider/modded-servers.mdx

@@ -1,14 +1,18 @@
 import { Versions } from '../../../../src/components/Versions'
 
 :::caution
-Geyser-Fabric runs **only** on a <Versions platform="java"/> Fabric server.   
-To use Geyser on an older Fabric server, you can use Geyser on a BungeeCord/Velocity proxy, or Geyser Standalone instead. 
+Geyser-Fabric and Geyser-NeoForge run **only** on a <Versions platform="java"/>.  
+To use Geyser with an older server version, you can use Geyser on a BungeeCord/Velocity proxy, Geyser-ViaProxy, or Geyser Standalone instead.
+:::
+
+:::info
+Geyser only works with **server-side** mods. Mods that require a client-side install will not work!
 :::
 
 1. Select your server hosting provider in the dropdown above.
-2. Download the mod from [the download page](https://download.geysermc.org/v2/projects/geyser/versions/latest/builds/latest/downloads/fabric).
-3. Place the Geyser-Fabric.jar in the `mods` folder, and restart the server. **You also need [FabricAPI](https://modrinth.com/mod/fabric-api).**
-4. Open your Geyser config, located in `/config/Geyser-Fabric/config.yml`, and find the following:
+2. Download the mod from [the download page](https://geysermc.org/download#geyser).
+3. Place the Geyser mod jar in the `mods` folder, and restart the server. **For Fabric, you will also need [FabricAPI](https://modrinth.com/mod/fabric-api).**
+4. Open your Geyser config, located in `/config/Geyser-Fabric/config.yml` (or `/config/Geyser-NeoForge/config.yml`), and find the following:
 
     ```yaml
     bedrock: 
@@ -32,5 +36,5 @@ To use Geyser on an older Fabric server, you can use Geyser on a BungeeCord/Velo
 5. Verify whether connections are possible by running `geyser connectiontest <ip>:<port>` in the console.
 
 :::info
-To allow Bedrock Edition players to join your server without needing to log in to a paid Java Edition account, you can use <a href="/floodgate/setup/">Floodgate</a>.
+For Geyser-Fabric: To allow Bedrock Edition players to join your server without needing to log in to a paid Java Edition account, you can use <a href="/floodgate/setup/">Floodgate</a>.
 :::

docs/geyser/setup/provider/paper-spigot.mdx

@@ -1,7 +1,7 @@
 import { Versions } from '../../../../src/components/Versions'
 
 :::info
-If your server is not running <Versions platform="java"/>, you will need to install <a href="https://www.spigotmc.org/resources/viaversion.19254/">ViaVersion</a>.
+If your server is not running <Versions platform="java"/>, you will need to install <a href="https://viaversion.com/">ViaVersion</a>.
 See also our <a href="/geyser/faq/#what-server-versions-does-geyser-support">FAQ article</a> on supported versions.
 :::
 

docs/geyser/setup/self/modded-servers.mdx

@@ -1,13 +1,17 @@
 import { Versions } from '../../../../src/components/Versions'
 
 :::caution
-Geyser-Fabric runs **only** on a <Versions platform="java"/> Fabric server.   
-To use Geyser on an older Fabric server, you can use Geyser on a BungeeCord/Velocity proxy, or Geyser Standalone instead. 
+Geyser-Fabric and Geyser-NeoForge run  **only** on a <Versions platform="java"/> Fabric server.   
+To use Geyser with an older server version, you can use Geyser on a BungeeCord/Velocity proxy, Geyser-ViaProxy or Geyser-Standalone instead.
 :::
 
-1. Download the mod from [the download page](https://download.geysermc.org/v2/projects/geyser/versions/latest/builds/latest/downloads/fabric).
-2. Place the Geyser-Fabric.jar in the `mods` folder, and restart the server. **You also need [FabricAPI](https://modrinth.com/mod/fabric-api).**
-3. Open your Geyser config, located in `/config/Geyser-Fabric/config.yml`, and find the following: 
+:::info
+Geyser only works with **server-side** mods. Mods that require a client-side install will not work!
+:::
+
+1. Download the mod from [the download page](https://geysermc.org/download#geyser).
+2. Place the Geyser mod jar in the `mods` folder, and restart the server. **For Fabric, you will also need [FabricAPI](https://modrinth.com/mod/fabric-api).**
+3. Open your Geyser config, located in `/config/Geyser-Fabric/config.yml` (or `/config/Geyser-NeoForge/config.yml`), and find the following: 
 
     ```yaml
     bedrock: 
@@ -46,5 +50,5 @@ To use Geyser on an older Fabric server, you can use Geyser on a BungeeCord/Velo
 5. Verify whether connections from other networks are possible by running `geyser connectiontest <ip>:<port>` in the console.
 
 :::info
-To allow Bedrock Edition players to join your server without needing to log in to a paid Java Edition account, you can use <a href="/floodgate/setup/">Floodgate</a>.
-:::
+For Geyser-Fabric: To allow Bedrock Edition players to join your server without needing to log in to a paid Java Edition account, you can use <a href="/floodgate/setup/">Floodgate</a>.
+:::

docs/geyser/setup/self/paper-spigot.mdx

@@ -1,7 +1,7 @@
 import { Versions } from '../../../../src/components/Versions'
 
 :::info
-If your server is not running <Versions platform="java"/>, you will need to install <a href="https://www.spigotmc.org/resources/viaversion.19254/">ViaVersion</a>.
+If your server is not running <Versions platform="java"/>, you will need to install <a href="https://viaversion.com/">ViaVersion</a>.
 See also our <a href="/geyser/faq/#what-server-versions-does-geyser-support">FAQ article</a> on supported versions.
 :::
 

docs/geyser/setup/self/viaproxy.mdx

@@ -0,0 +1,50 @@
+1. [Setup ViaProxy](https://github.com/ViaVersion/ViaProxy?tab=readme-ov-file#usage-for-players-gui).
+2. Download the plugin from [the download page](https://download.geysermc.org/v2/projects/geyser/versions/latest/builds/latest/downloads/viaproxy).
+3. Place the Geyser-ViaProxy.jar in the `plugins` folder, and restart ViaProxy.
+4. Open your Geyser config, located in `/plugins/Geyser/config.yml`, and find the following:
+
+    ```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 
+    ```
+    The vital part is the port. This is the port that Bedrock players will use to connect to your server!
+    If you enable `clone-remote-port`, the port will be overridden and the ViaProxy port is used.
+    Since you are self-hosting, you can choose the port freely - the default port is 19132.
+
+    **Important**: Other services/plugins that rely on ports with UDP, such as Voice Chats or Query, cannot share the port with Geyser.
+
+    If you use the ViaProxy GUI you can use its account management system to join online mode servers with Bedrock Edition. If you use the ViaProxy CLI and want to allow Bedrock players to join your online mode server you have to install and [set up Floodgate](/floodgate/setup). <br/>
+
+    NOTE: The value of the `auth-type` field is ignored and managed by ViaProxy automatically.
+
+5. Connecting to your server
+    
+    **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).
+    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**
+
+    You will need to expose the port Geyser runs on to the Internet if you want players from outside your network to join.
+    To achieve that, you have two options:
+
+    - Port forwarding: Open the Geyser port (e.g. 19132) on the UDP protocol in your router/modem, and in the Windows/Linux firewall. 
+   [Our port forwarding guide](/geyser/port-forwarding) explains how to do this in detail.
+   After doing this, players can connect with your public IPv4 + port to your server.
+
+    - playit.gg: Instead of opening a port (which might not be an option/if you do not want to expose your home ip), you can use
+   the playit.gg service to create a tunnel for you to route the traffic through. See our [playit.gg guide](/geyser/playit-gg).
+   Ngrok will not work since it is TCP-only.
+
+6. Verify whether connections from other networks are possible by running `geyser connectiontest <ip>:<port>` in the console.
+
+:::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](/floodgate/setup).
+:::