From f1ec14150473733d2dbbe931ca9209b5181687c4 Mon Sep 17 00:00:00 2001 From: Tim203 Date: Wed, 7 Feb 2024 08:30:50 +0100 Subject: [PATCH 1/8] Update versions.json to 1.20.61 --- _data/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/versions.json b/_data/versions.json index 3b92ee2..258290b 100644 --- a/_data/versions.json +++ b/_data/versions.json @@ -1,4 +1,4 @@ { - "bedrock": "1.20.40-1.20.51", + "bedrock": "1.20.40-1.20.61", "java": "1.20.4" } From cf256e59ec8039ea4368eac2780f2270e88ab641 Mon Sep 17 00:00:00 2001 From: Alan Escarcha Date: Fri, 16 Feb 2024 08:40:29 -0300 Subject: [PATCH 2/8] Add VexyHost to provider list (#247) --- _data/providers.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/_data/providers.json b/_data/providers.json index b0f2f93..33f50bb 100644 --- a/_data/providers.json +++ b/_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/", From 2533b49675c6834366f371615a9c335a4d350e4e Mon Sep 17 00:00:00 2001 From: qscbm187531 <1309635304@qq.com> Date: Sun, 18 Feb 2024 21:10:06 +0800 Subject: [PATCH 3/8] Update link for local linking databases (#246) --- _docs/floodgate/linking.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_docs/floodgate/linking.md b/_docs/floodgate/linking.md index d59a447..6861dd6 100644 --- a/_docs/floodgate/linking.md +++ b/_docs/floodgate/linking.md @@ -41,7 +41,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. From b395c4591b069c2dfff233e7c41276121a187431 Mon Sep 17 00:00:00 2001 From: rtm516 Date: Mon, 19 Feb 2024 19:07:38 +0000 Subject: [PATCH 4/8] Update links for new download page --- _docs/other/geyserconnect.md | 4 ++-- _includes/setup/instructions/floodgate/proxy.md | 2 +- _includes/setup/instructions/floodgate/standalone.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/_docs/other/geyserconnect.md b/_docs/other/geyserconnect.md index 1e8ee8b..607af23 100644 --- a/_docs/other/geyserconnect.md +++ b/_docs/other/geyserconnect.md @@ -6,8 +6,8 @@ GeyserConnect is a extension for Geyser that allows you to join multiple servers ## Setup (For GeyserConnect to work you need an open UDP port, by default it's `19132`.) -1. Download the latest Geyser build from the [downloads page](https://geysermc.org/download#standalone) -2. Download the latest build from [Github Actions](https://github.com/GeyserMC/GeyserConnect/actions) +1. Download the latest standalone Geyser build from the [downloads page](https://geysermc.org/download) +2. Download the latest GeyserConnect from the [downloads page](https://geysermc.org/download#other-geyserconnect) 3. Extract the downloaded ZIP file, and put the extracted JAR file into the `extensions` folder in your GeyserMC standalone installation. 4. Start Geyser standalone as you do with a normal Geyser install. EG: `java -Xms1024M -jar Geyser.jar` (More info on [Creating a Startup Script](/geyser/creating-a-startup-script/)) 5. Shutdown the standalone Geyser instance, and make you're desired changes to the GeyserConnect configuration in `GeyserConnect` in the `extensions` folder. diff --git a/_includes/setup/instructions/floodgate/proxy.md b/_includes/setup/instructions/floodgate/proxy.md index c26e5fa..57baf70 100644 --- a/_includes/setup/instructions/floodgate/proxy.md +++ b/_includes/setup/instructions/floodgate/proxy.md @@ -5,7 +5,7 @@ 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. diff --git a/_includes/setup/instructions/floodgate/standalone.md b/_includes/setup/instructions/floodgate/standalone.md index 3d5514e..a3b361a 100644 --- a/_includes/setup/instructions/floodgate/standalone.md +++ b/_includes/setup/instructions/floodgate/standalone.md @@ -4,7 +4,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. From fa665dd1bb46b4d383df318d5d4ab77760b841db Mon Sep 17 00:00:00 2001 From: rtm516 Date: Mon, 19 Feb 2024 19:21:19 +0000 Subject: [PATCH 5/8] Update GeyserOptionalPack download link --- _docs/other/geyseroptionalpack.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_docs/other/geyseroptionalpack.md b/_docs/other/geyseroptionalpack.md index 712e2cc..c4f99a5 100644 --- a/_docs/other/geyseroptionalpack.md +++ b/_docs/other/geyseroptionalpack.md @@ -1,7 +1,7 @@ --- title: GeyserOptionalPack --- -# [Download here](https://ci.opencollab.dev/job/GeyserMC/job/GeyserOptionalPack/job/master/lastSuccessfulBuild/artifact/GeyserOptionalPack.mcpack) +# [Download here](https://geysermc.org/download#other-geyseroptionalpack) GeyserOptionalPack is a Bedrock resource pack that adds more features to Geyser to bring Bedrock Edition in line with Java Edition. A resource pack allows various features and bug fixes to be implemented in Bedrock, including: From 4878bc24b823ac9dc4c30110839e78ac4cf0368a Mon Sep 17 00:00:00 2001 From: RK_01 <50594595+RaphiMC@users.noreply.github.com> Date: Mon, 19 Feb 2024 22:25:52 +0100 Subject: [PATCH 6/8] Added ViaProxy setup instructions (#236) * Added ViaProxy setup instructions * Added more clarification * Clarified and improved instructions * Updated floodgate link --------- Co-authored-by: chris --- _docs/floodgate/setup.md | 7 +++ _docs/geyser/setup.md | 2 +- .../setup/instructions/floodgate/viaproxy.md | 14 +++++ .../instructions/geyser/selfhost/viaproxy.md | 50 ++++++++++++++++++ _includes/setup/instructions/geyser/tabs.html | 11 ++++ img/icons/viaproxy.png | Bin 0 -> 33885 bytes 6 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 _includes/setup/instructions/floodgate/viaproxy.md create mode 100644 _includes/setup/instructions/geyser/selfhost/viaproxy.md create mode 100644 img/icons/viaproxy.png diff --git a/_docs/floodgate/setup.md b/_docs/floodgate/setup.md index 32bd6c3..3409193 100644 --- a/_docs/floodgate/setup.md +++ b/_docs/floodgate/setup.md @@ -19,6 +19,9 @@ page_sidebar: false + @@ -37,6 +40,10 @@ page_sidebar: false {% capture my_include %}{% include setup/instructions/floodgate/proxy.md %}{% endcapture %} {{ my_include | markdownify }} +
+ {% capture my_include %}{% include setup/instructions/floodgate/viaproxy.md %}{% endcapture %} + {{ my_include | markdownify }} +
{% capture my_include %}{% include setup/instructions/floodgate/standalone.md %}{% endcapture %} {{ my_include | markdownify }} diff --git a/_docs/geyser/setup.md b/_docs/geyser/setup.md index bde658c..17fd875 100644 --- a/_docs/geyser/setup.md +++ b/_docs/geyser/setup.md @@ -15,7 +15,7 @@ page_sidebar: false
- {% include setup/instructions/geyser/tabs.html type="selfhost" show_standalone=true %} + {% include setup/instructions/geyser/tabs.html type="selfhost" show_viaproxy=true show_standalone=true %}
diff --git a/_includes/setup/instructions/floodgate/viaproxy.md b/_includes/setup/instructions/floodgate/viaproxy.md new file mode 100644 index 0000000..b8774bb --- /dev/null +++ b/_includes/setup/instructions/floodgate/viaproxy.md @@ -0,0 +1,14 @@ +# Floodgate setup with Geyser for ViaProxy + + + +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. + + diff --git a/_includes/setup/instructions/geyser/selfhost/viaproxy.md b/_includes/setup/instructions/geyser/selfhost/viaproxy.md new file mode 100644 index 0000000..08eef5c --- /dev/null +++ b/_includes/setup/instructions/geyser/selfhost/viaproxy.md @@ -0,0 +1,50 @@ +# ViaProxy Setup + +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).
+ + 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 :` in the console. + + diff --git a/_includes/setup/instructions/geyser/tabs.html b/_includes/setup/instructions/geyser/tabs.html index c673423..7d4a953 100644 --- a/_includes/setup/instructions/geyser/tabs.html +++ b/_includes/setup/instructions/geyser/tabs.html @@ -8,6 +8,11 @@ + {% if include.show_viaproxy != nil %} + + {% endif %} {% if include.show_standalone != nil %}