From 8c45fae8ffb3b6a8fb62f2e027a2d55c6384ee3d Mon Sep 17 00:00:00 2001 From: Chew Date: Mon, 21 Mar 2022 11:47:12 -0500 Subject: [PATCH 001/118] Deploy on PR --- .github/workflows/build-artifact.yml | 47 ++++++++++++++++++++++++++++ .github/workflows/build-pr.yml | 29 +++++++++++++++++ Gemfile | 2 ++ Gemfile.lock | 2 ++ 4 files changed, 80 insertions(+) create mode 100644 .github/workflows/build-artifact.yml create mode 100644 .github/workflows/build-pr.yml diff --git a/.github/workflows/build-artifact.yml b/.github/workflows/build-artifact.yml new file mode 100644 index 0000000..212da01 --- /dev/null +++ b/.github/workflows/build-artifact.yml @@ -0,0 +1,47 @@ +name: "Build Artifact" + +on: + workflow_call: + inputs: + preview: + description: "Is this a preview deployment?" + default: false + required: false + type: boolean + url: + description: "Domain the deployment will be hosted on" + required: false + type: string + baseurl: + description: "Path where does are hosted on domain" + required: false + type: string + +env: + NODE_VERSION: "17" + DEPLOY_PREVIEW: ${{ inputs.preview }} + PREVIEW_URL: ${{ inputs.url }} + PREVIEW_BASE_URL: ${{ inputs.baseurl }} + +jobs: + build-docs: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: "Setup Node ${{ env.NODE_VERSION }}" + uses: actions/setup-node@v3 + with: + node-version: "${{ env.NODE_VERSION }}" + cache: "yarn" + - name: "Install Dependencies" + run: "bundle install" + - name: "Build Docs" + run: bundle exec jekyll build + - name: "Upload HTML" + uses: actions/upload-artifact@v3 + with: + name: html + path: _site/ + retention-days: 1 \ No newline at end of file diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml new file mode 100644 index 0000000..9dfd985 --- /dev/null +++ b/.github/workflows/build-pr.yml @@ -0,0 +1,29 @@ +# Based on https://github.com/KyoriPowered/adventure-docs + +name: "Build PR" + +on: + pull_request: + +concurrency: + group: "${{ github.workflow }}-${{ github.event.number || github.ref }}" + cancel-in-progress: true + +jobs: + build: + uses: ./.github/workflows/build-artifact.yaml + with: + preview: true + url: "https://geysermc.github.io" + baseurl: "/docs-previews/pull/${{ github.event.number }}/" + publish-pr-number: + runs-on: "ubuntu-latest" + steps: + - name: "pr number / save" + run: "echo ${{ github.event.number }} > ./pr-num.txt" + - name: "pr number / publish" + uses: actions/upload-artifact@v3 + with: + name: "pr-num" + path: "./pr-num.txt" + retention-days: 1 \ No newline at end of file diff --git a/Gemfile b/Gemfile index 1d7a3a7..b846a2c 100644 --- a/Gemfile +++ b/Gemfile @@ -21,3 +21,5 @@ gem "github-pages", group: :jekyll_plugins # group :jekyll_plugins do # gem "jekyll-github-metadata", "~> 1.0" # end + +gem 'webrick' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 84226f4..22f6827 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -279,6 +279,7 @@ GEM unf_ext (0.0.8) unf_ext (0.0.8-x64-mingw32) unicode-display_width (1.8.0) + webrick (1.7.0) zeitwerk (2.5.4) PLATFORMS @@ -287,6 +288,7 @@ PLATFORMS DEPENDENCIES github-pages + webrick BUNDLED WITH 2.2.32 From 5d900cf2de5f14d960562453cbbfd219f7cd0534 Mon Sep 17 00:00:00 2001 From: Villagers654 <74448585+Villagers654@users.noreply.github.com> Date: Thu, 24 Mar 2022 23:41:42 +0900 Subject: [PATCH 002/118] Update anticheat-compatibility.md (#19) Added some anticheats that were missing in my original list --- _docs/geyser/anticheat-compatibility.md | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/_docs/geyser/anticheat-compatibility.md b/_docs/geyser/anticheat-compatibility.md index 2167074..3a24995 100644 --- a/_docs/geyser/anticheat-compatibility.md +++ b/_docs/geyser/anticheat-compatibility.md @@ -10,23 +10,27 @@ Do note that this is a community-compiled list and is incomplete! If you wish to Full Compatibility (Checks Bedrock Players Accurately) -- [AntiAura](https://www.spigotmc.org/resources/1368/) - Last Updated on 19th August 2021 +- [AntiAura](https://www.spigotmc.org/resources/1368/) (Paid) - Last Updated on 19th August 2021 - [Themis](https://www.spigotmc.org/resources/90766/) - Last Updated on 19th August 2021 - [LightAntiCheat](https://www.spigotmc.org/resources/96341/) - Last Updated on 4th December 2021 +- [Negativity V2](https://www.spigotmc.org/resources/86874/) (Paid) - Last Updated on 21st March 2022 Partially Compatible (Does not Check/Ignores Bedrock Players) -- [AAC](https://www.spigotmc.org/resources/6442/) - Last Updated on 19th August 2021 +- [AAC](https://www.spigotmc.org/resources/6442/) (Paid) - Last Updated on 19th August 2021 - [Flappy Anticheat](https://www.spigotmc.org/resources/92180/) - Last Updated on 14th September 2021 -- [Matrix](https://matrix.rip/) - Last updated on 2nd September 2021 -- [Spartan](https://www.spigotmc.org/resources/25638/) (Spartan Syn offers full Bedrock checks for an additional $43) - Last Updated on 19th August 2021 -- [Vulcan](https://www.spigotmc.org/resources/83626/) - Last Updated on 19th August 2021 +- [GrimAC](https://github.com/MWHunter/Grim) - Last Updated on 24th March 2022 +- [Matrix](https://matrix.rip/) (Paid) - Last updated on 2nd September 2021 +- [Spartan](https://www.spigotmc.org/resources/25638/) (Spartan Syn offers full Bedrock checks for an additional $43) (Paid) - Last Updated on 19th August 2021 +- [Vulcan](https://www.spigotmc.org/resources/83626/) (Paid) - Last Updated on 19th August 2021 Incompatible (False Positives on Bedrock Players, no Compatibility at All) - [AntiCheatReloaded](https://www.spigotmc.org/resources/23799/) - Last Updated on 19th August 2021 -- [Negativity](https://www.spigotmc.org/resources/86874/) - Last Updated on 19th August 2021 +- [Negativity V1](https://www.spigotmc.org/resources/48399/) - Last Updated on 21st March 2022 - [NoCheatPlus](https://ci.codemc.io/job/Updated-NoCheatPlus/job/Updated-NoCheatPlus/) ([Compat NCP](https://github.com/Updated-NoCheatPlus/CompatNoCheatPlus/) is an addon that enables Partial Compatibility) - Last Updated on 19th August 2021 -- [Reflex](https://www.spigotmc.org/resources/21122/) - Last Updated on 19th August 2021 +- [GodsEye](https://www.spigotmc.org/resources/69595/) ([GodsEyeGeyserMC](https://github.com/TheDejavu/GodsEyeGeyserMC/releases) is an addon that enables Partial Compatibility) (Paid) - Last Updated on 21st March 2022 +- [Kauri](https://www.spigotmc.org/resources/53721/) (Paid) - Last Updated on 21st March 2022 +- [Reflex](https://www.spigotmc.org/resources/21122/) (Paid) - Last Updated on 19th August 2021 - [SoaromaSAC](https://www.spigotmc.org/resources/87702/) - Last Updated on 19th August 2021 -- [Wraith](https://www.spigotmc.org/resources/66887/) - Last Updated on 19th August 2021 +- [Wraith](https://www.spigotmc.org/resources/66887/) (Paid) - Last Updated on 19th August 2021 From 73b3fee8c48758fc3299a34a1a4c646944e6e6b3 Mon Sep 17 00:00:00 2001 From: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Thu, 24 Mar 2022 17:43:07 -0400 Subject: [PATCH 003/118] Iron golem cracks are now in the base game --- _docs/geyser/current-limitations.md | 1 - 1 file changed, 1 deletion(-) diff --git a/_docs/geyser/current-limitations.md b/_docs/geyser/current-limitations.md index 25759b1..aeabcc8 100644 --- a/_docs/geyser/current-limitations.md +++ b/_docs/geyser/current-limitations.md @@ -29,7 +29,6 @@ The following things cannot be fixed without changes to Bedrock or the Java prot The following changes **are supported** with the [GeyserOptionalPack](https://github.com/GeyserMC/Geyser/wiki/GeyserOptionalPack), which is a Bedrock resource pack you can install for additional functionality for features Bedrock does not natively support: - Custom armor stand poses - Illusioners -- Iron golem cracked texture - Hit particles and other miscellaneous particles not natively in Bedrock - Offhand animations - Shulker invisibility From 5bdfec42db004929581979ce28d0bcfcca2eb3c9 Mon Sep 17 00:00:00 2001 From: CyberFlame Date: Sun, 27 Mar 2022 16:54:21 +1300 Subject: [PATCH 004/118] update repo name (#22) --- _docs/geyser/current-limitations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_docs/geyser/current-limitations.md b/_docs/geyser/current-limitations.md index aeabcc8..0010678 100644 --- a/_docs/geyser/current-limitations.md +++ b/_docs/geyser/current-limitations.md @@ -19,7 +19,7 @@ The following things cannot be fixed without changes to Bedrock or the Java prot - Various command arguments for any command that doesn't use the Minecraft Brigadier library - Anything that relies on tab complete or typing in the chat UI (related to the above) - Bedrock sends no packet that indicates they are in this menu - Unable to see banner layers past 6 -- Movement issues around bamboo due to offset differences between Java and Bedrock. The following plugin works around this, but please read the README before using: https://github.com/Camotoy/BambooCollisionFix +- Movement issues around bamboo due to offset differences between Java and Bedrock. The following plugin works around this, but please read the README before using: https://github.com/Camotoy/GeyserHacks - Custom anvil recipes - Heights lower than -64 or higher than 320 in the overworld with extended height enabled, and heights lower than 0 or higher than 256 in other dimensions - Dolphin's Grace potion effect visuals (effects should still work correctly) From 89dd493a085f016ecd65d2dd043fb1d876b8ced1 Mon Sep 17 00:00:00 2001 From: Konicai <71294714+Konicai@users.noreply.github.com> Date: Sat, 26 Mar 2022 23:54:38 -0400 Subject: [PATCH 005/118] hyperlink downloads on floodgate setup page (#23) --- _docs/floodgate/setup.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_docs/floodgate/setup.md b/_docs/floodgate/setup.md index 2258a3a..7997b1b 100644 --- a/_docs/floodgate/setup.md +++ b/_docs/floodgate/setup.md @@ -6,8 +6,8 @@ permalink: /floodgate/setup/ ## Downloads: -Floodgate: https://ci.opencollab.dev/job/GeyserMC/job/Floodgate/job/master/ -Geyser: https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/master/ +Floodgate: [https://ci.opencollab.dev/job/GeyserMC/job/Floodgate/job/master/](https://ci.opencollab.dev/job/GeyserMC/job/Floodgate/job/master/) +Geyser: [https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/master/](https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/master/) ## Prerequisites From a200768e3e8d980e90c0685fce39e0eeb4d03db9 Mon Sep 17 00:00:00 2001 From: Lars Jarred Speetjens Date: Sun, 27 Mar 2022 14:58:20 +0200 Subject: [PATCH 006/118] Add Cubes Hosting as a hosting provider. (#24) Adds Cubes Hosting as a hosting provider to the wiki. --- _data/providers.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/_data/providers.json b/_data/providers.json index 9c3b70f..69b42fb 100644 --- a/_data/providers.json +++ b/_data/providers.json @@ -23,6 +23,11 @@ "url": "https://www.creeperhost.net/", "description": "Has a toggle within the control panel to automatically enable Geyser. May not be enabled by default, so you may need to toggle it and restart the server." }, + { + "name": "Cubes Hosting", + "url": "https://www.cubes.host/", + "description": "Install Geyser as a plugin from the plugin manager configure with the correct port then restart the server and Geyser works out of the box as expected." + }, { "name": "exaroton", "url": "https://exaroton.com/", From 56c7c81a944270ea17958a09272bd031328ce4f3 Mon Sep 17 00:00:00 2001 From: Mac <37410297+itsmemac@users.noreply.github.com> Date: Sun, 27 Mar 2022 20:28:11 +0530 Subject: [PATCH 007/118] Fix download link (#26) * Fix download link * Update _docs/other/geyser-fabric.md Co-authored-by: rtm516 Co-authored-by: rtm516 --- _docs/other/geyser-fabric.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_docs/other/geyser-fabric.md b/_docs/other/geyser-fabric.md index 2a17e4d..7d9cd84 100644 --- a/_docs/other/geyser-fabric.md +++ b/_docs/other/geyser-fabric.md @@ -4,7 +4,7 @@ title: Geyser-Fabric permalink: /other/geyser-fabric/ --- -# [Download here](https://ci.opencollab.dev/job/GeyserMC/job/Geyser-Fabric/job/java-1.18/lastSuccessfulBuild/artifact/build/libs/Geyser-Fabric-2.0.1-SNAPSHOT.jar) +# [Download here](https://ci.opencollab.dev/job/GeyserMC/job/Geyser-Fabric/job/java-1.18/) For the most part, Geyser-Fabric operates the same as other Geyser platforms. There are a couple of exceptions: From f0da1225c8d5771cdad1276bb97324cb9ac88658 Mon Sep 17 00:00:00 2001 From: Valentijn Hoogeboom <49687913+ValentijnDevelopment@users.noreply.github.com> Date: Tue, 29 Mar 2022 20:41:44 +0200 Subject: [PATCH 008/118] Update providers.json (#27) --- _data/providers.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/_data/providers.json b/_data/providers.json index 69b42fb..0fb8970 100644 --- a/_data/providers.json +++ b/_data/providers.json @@ -419,6 +419,11 @@ "url": "https://ultimatesrv.com/", "description_template": "default" }, + { + "name": "Volcano Hosting", + "url": "https://www.volcanohosting.net/", + "description_template": "default" + }, { "name": "Vultam", "url": "https://vultam.net/", From cf072e1eb30dbd982418ae3284da4bcd397835a4 Mon Sep 17 00:00:00 2001 From: hz-ad <79017780+hz-ad@users.noreply.github.com> Date: Mon, 4 Apr 2022 09:24:50 -0700 Subject: [PATCH 009/118] Update providers.json (#30) Add HostEZ to the supported list for plugins. --- _data/providers.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/_data/providers.json b/_data/providers.json index 0fb8970..3e3c256 100644 --- a/_data/providers.json +++ b/_data/providers.json @@ -228,6 +228,11 @@ "url": "https://hokus.me", "description_template": "default" }, + { + "name": "HostEZ", + "url": "https://hostez.io/minecraft", + "description": "Geyser plugin supported with self-install or installed on request with its own port. Includes firewall tested to be compatible with Geyser." + }, { "name": "HostMC4Free", "url": "https://hostmc4free.com", From 0776b2068c8f45df8c4b442e8c733f23916ef784 Mon Sep 17 00:00:00 2001 From: Korbsti <73249443+Korbsti@users.noreply.github.com> Date: Mon, 4 Apr 2022 12:39:59 -0400 Subject: [PATCH 010/118] Update anticheat-compatibility.md (#28) --- _docs/geyser/anticheat-compatibility.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_docs/geyser/anticheat-compatibility.md b/_docs/geyser/anticheat-compatibility.md index 3a24995..341baf9 100644 --- a/_docs/geyser/anticheat-compatibility.md +++ b/_docs/geyser/anticheat-compatibility.md @@ -14,6 +14,7 @@ Full Compatibility (Checks Bedrock Players Accurately) - [Themis](https://www.spigotmc.org/resources/90766/) - Last Updated on 19th August 2021 - [LightAntiCheat](https://www.spigotmc.org/resources/96341/) - Last Updated on 4th December 2021 - [Negativity V2](https://www.spigotmc.org/resources/86874/) (Paid) - Last Updated on 21st March 2022 +- [SoaromaSAC](https://www.spigotmc.org/resources/87702/) - Last Updated on 27th March 2022 Partially Compatible (Does not Check/Ignores Bedrock Players) @@ -32,5 +33,4 @@ Incompatible (False Positives on Bedrock Players, no Compatibility at All) - [GodsEye](https://www.spigotmc.org/resources/69595/) ([GodsEyeGeyserMC](https://github.com/TheDejavu/GodsEyeGeyserMC/releases) is an addon that enables Partial Compatibility) (Paid) - Last Updated on 21st March 2022 - [Kauri](https://www.spigotmc.org/resources/53721/) (Paid) - Last Updated on 21st March 2022 - [Reflex](https://www.spigotmc.org/resources/21122/) (Paid) - Last Updated on 19th August 2021 -- [SoaromaSAC](https://www.spigotmc.org/resources/87702/) - Last Updated on 19th August 2021 - [Wraith](https://www.spigotmc.org/resources/66887/) (Paid) - Last Updated on 19th August 2021 From 6fd3bcab1ca5a8530fce18b3708ce5ded524704f Mon Sep 17 00:00:00 2001 From: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Wed, 6 Apr 2022 18:46:53 -0400 Subject: [PATCH 011/118] Mention the Bedrock dedicated server for troubleshooting --- _docs/geyser/fixing-unable-to-connect-to-world.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/_docs/geyser/fixing-unable-to-connect-to-world.md b/_docs/geyser/fixing-unable-to-connect-to-world.md index 6df6894..b16d65b 100644 --- a/_docs/geyser/fixing-unable-to-connect-to-world.md +++ b/_docs/geyser/fixing-unable-to-connect-to-world.md @@ -93,6 +93,10 @@ If you get this error while using the Pterodactyl Panel, try editing the Geyser 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... + +Minecraft offers a vanilla Bedrock server [here](https://www.minecraft.net/en-us/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 ## Windows 10 From be72105ed3f596aff639c3ac81740eeb1e89a9bf Mon Sep 17 00:00:00 2001 From: Dylan Ogle Date: Sat, 9 Apr 2022 20:06:13 +0100 Subject: [PATCH 012/118] Add Redline Hosting to supported providers (#33) * Add Redline Hosting * Alphabetical * I'm an idiot. --- _data/providers.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/_data/providers.json b/_data/providers.json index 3e3c256..d3c8110 100644 --- a/_data/providers.json +++ b/_data/providers.json @@ -339,6 +339,11 @@ "url": "https://ramshard.com/", "description_template": "default" }, + { + "name": "Redline Hosting", + "url": "https://redlinehosting.net/", + "description_template": "default" + }, { "name": "ReviveHost", "url": "https://revivehost.com", From a2f23300ec7ffeea0fbe0510a85cd590eb36b60f Mon Sep 17 00:00:00 2001 From: DJelly4K <68630033+DJelly4K@users.noreply.github.com> Date: Sat, 16 Apr 2022 23:21:39 +0800 Subject: [PATCH 013/118] Fix jump to old wiki (#32) * Update current-limitations.md * Update _docs/geyser/current-limitations.md Co-authored-by: rtm516 Co-authored-by: rtm516 --- _docs/geyser/current-limitations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_docs/geyser/current-limitations.md b/_docs/geyser/current-limitations.md index 0010678..3508143 100644 --- a/_docs/geyser/current-limitations.md +++ b/_docs/geyser/current-limitations.md @@ -26,7 +26,7 @@ The following things cannot be fixed without changes to Bedrock or the Java prot - Invisible item frames - Blocks (excluding jack-o-lantern) on entity heads (E.G. armor stands, players) -The following changes **are supported** with the [GeyserOptionalPack](https://github.com/GeyserMC/Geyser/wiki/GeyserOptionalPack), which is a Bedrock resource pack you can install for additional functionality for features Bedrock does not natively support: +The following changes **are supported** with the [GeyserOptionalPack](/other/geyseroptionalpack/), which is a Bedrock resource pack you can install for additional functionality for features Bedrock does not natively support: - Custom armor stand poses - Illusioners - Hit particles and other miscellaneous particles not natively in Bedrock From e657c09dd22b70812ac4c9acffb5dc83cd620921 Mon Sep 17 00:00:00 2001 From: 7man7LMYT <67489949+7man7LMYT@users.noreply.github.com> Date: Sun, 17 Apr 2022 16:57:51 -0700 Subject: [PATCH 014/118] Update versions.json (#34) --- _data/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/versions.json b/_data/versions.json index ce6481c..e27bd9f 100644 --- a/_data/versions.json +++ b/_data/versions.json @@ -1,4 +1,4 @@ { - "bedrock": "1.17.41 - 1.18.12", + "bedrock": "1.18.0 - 1.18.30", "java": "1.18.2" } From bbeffa5b86744e3f2eaf825c14dd162b99545d2d Mon Sep 17 00:00:00 2001 From: rtm516 Date: Wed, 20 Apr 2022 19:03:28 +0100 Subject: [PATCH 015/118] Fix pakkit download link --- _docs/other/developer-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_docs/other/developer-guide.md b/_docs/other/developer-guide.md index fd440ef..4ebe9a5 100644 --- a/_docs/other/developer-guide.md +++ b/_docs/other/developer-guide.md @@ -39,7 +39,7 @@ The Bedrock Edition protocol is documented [here](https://wiki.vg/Bedrock_Protoc [debuginfo-be](https://github.com/Heath123/debuginfo-be) is a Spigot plugin that displays an overlay to Geyser clients with useful debug information, similar to the F3 screen in Java Edition. ## pakkit -pakkit is a GUI-based tool for intercepting packets between a server and client developed by Geyser contributor [circuit10/Heath123](https://github.com/Heath123/) built using Electron. It works for both Java Edition (using node-minecraft-protocol) and Bedrock (as a GUI wrapper for ProxyPass adding extra features). It supports features such as viewing packet data in JSON format, Edit and Resend and a hex view for raw packet data. You can download it from [here](https://ci.rtm516.co.uk/job/pakkit/job/master/). It's currently WIP, so expect bugs. +pakkit is a GUI-based tool for intercepting packets between a server and client developed by Geyser contributor [circuit10/Heath123](https://github.com/Heath123/) built using Electron. It works for both Java Edition (using node-minecraft-protocol) and Bedrock (as a GUI wrapper for ProxyPass adding extra features). It supports features such as viewing packet data in JSON format, Edit and Resend and a hex view for raw packet data. You can download it from [here](https://github.com/Heath123/pakkit/releases/). It's currently WIP, so expect bugs. ## ProxyPass ProxyPass is a tool for intercepting packets between a Bedrock server and client developed by the Cloudburst team. It can be found [here](https://github.com/NukkitX/ProxyPass) and the vanilla Bedrock server can be found [here](https://www.minecraft.net/en-us/download/server/bedrock/). From 8fd7e07de4aa912730ffbc3902d604af30aaa725 Mon Sep 17 00:00:00 2001 From: 7man7LMYT <67489949+7man7LMYT@users.noreply.github.com> Date: Thu, 21 Apr 2022 20:37:02 -0700 Subject: [PATCH 016/118] Add a playit.gg guide (#18) * Create playit-gg.md * Update toc.yml Should fix the building issues lol --- _data/toc.yml | 2 ++ _docs/geyser/playit-gg.md | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 _docs/geyser/playit-gg.md diff --git a/_data/toc.yml b/_data/toc.yml index 4013380..8b87e99 100644 --- a/_data/toc.yml +++ b/_data/toc.yml @@ -39,6 +39,8 @@ url: "geyser/using-geyser-or-floodgate-as-a-dependency/" - title: Current Limitations url: "geyser/current-limitations/" + - title: Using playit.gg with Geyser + url: "geyser/playit-gg/" - title: Floodgate Documentation url: "floodgate/" links: diff --git a/_docs/geyser/playit-gg.md b/_docs/geyser/playit-gg.md new file mode 100644 index 0000000..8a2793e --- /dev/null +++ b/_docs/geyser/playit-gg.md @@ -0,0 +1,29 @@ +--- +layout: page +title: playit.gg Setup +permalink: /geyser/playit-gg/ +--- + +## Prerequisites + +- You must be able to connect to your Geyser instance locally. + +## Setup +1. Head over to [playit.gg's website](https://playit.gg/). +2. Select the "Minecraft Bedrock" option. + ![img](https://cdn.discordapp.com/attachments/744287608217272351/954912170838224908/unknown.png) +3. Select "Yes" for the next 2 questions. It'll then prompt you to download the playit.gg program. Make sure to download the correct one for your system, then run it. + ![img](https://cdn.discordapp.com/attachments/744287608217272351/955133727602802748/unknown.png) +4. Create a playit.gg account (Alternatively, you can select the guest button if you are trying it out). + ![img](https://cdn.discordapp.com/attachments/744287608217272351/955135576045137971/unknown.png) +5. Connect to your tunnel using the provided playit.gg address. + ![img](https://cdn.discordapp.com/attachments/744287608217272351/955138885388730428/unknown.png) +6. If you join successfully, then you are done! Make sure to leave the playit.gg program running as closing it will close the tunnel. (If you failed to join, check out the [troubleshooting](/geyser/setting-up-playit-gg/#troubleshooting) section of the page.) + +## Troubleshooting + +### I can't connect to my server! +* *Make sure to check [here](/geyser/fixing-unable-to-connect-to-world/) beforehand.* +* *If you changed the port that Geyser would bind to, you'll have to tell playit.gg to use that port instead in the image below.* + ![img](https://cdn.discordapp.com/attachments/614877230811709474/955162113138102404/unknown.png) +* *(Alternatively: You can try setting the* `bedrock` `port` *in the Geyser configuration to* `19132`.) From 3e700421488ff23cc1f9ec870a68daa4d359754f Mon Sep 17 00:00:00 2001 From: TheMonBon <71078643+TheMonBonGH@users.noreply.github.com> Date: Thu, 21 Apr 2022 22:43:06 -0500 Subject: [PATCH 017/118] Fix download link (#36) * Fix download link * Be consistent with Geyser-Fabric's page --- _docs/other/geyseroptionalpack.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/_docs/other/geyseroptionalpack.md b/_docs/other/geyseroptionalpack.md index 50d7bff..89263c2 100644 --- a/_docs/other/geyseroptionalpack.md +++ b/_docs/other/geyseroptionalpack.md @@ -3,8 +3,7 @@ layout: page title: GeyserOptionalPack permalink: /other/geyseroptionalpack/ --- - -**Download:** https://ci.opencollab.dev/job/GeyserMC/job/GeyserOptionalPack/job/master/lastSuccessfulBuild/artifact/GeyserOptionalPack.mcpack +# [Download here](https://ci.opencollab.dev/job/GeyserMC/job/GeyserOptionalPack/job/master/lastSuccessfulBuild/artifact/GeyserOptionalPack.mcpack) 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 44de0f66f0e43ee11eab7e9b8bb2fd73946900a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Braulio=20L=C3=B3pez=20=28UraharaNZ=29?= <83846593+UraharaNZ@users.noreply.github.com> Date: Tue, 26 Apr 2022 13:43:59 -0400 Subject: [PATCH 018/118] Update FAQ (DBA) (#38) DBA added official support to Floodgate/GeyserMC --- _docs/geyser/faq.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_docs/geyser/faq.md b/_docs/geyser/faq.md index 7546ed3..363566c 100644 --- a/_docs/geyser/faq.md +++ b/_docs/geyser/faq.md @@ -23,7 +23,7 @@ Geyser should generally work fine with plugins, as we emulate a Java client. The Floodgate can cause issues with plugins as it modifies the login process. *Please note that any offline mode authenticator plugins are only here for documentation; Geyser does not support offline mode usage.* -* [DynamicBungeeAuth](https://www.spigotmc.org/resources/27480/) produces invalid credentials for Bedrock players. +* [DynamicBungeeAuth](https://www.spigotmc.org/resources/27480/) Currently working on latest version 10.28B+ (10.27B and older versions produces invalid credentials for Bedrock players) * [FastLogin](https://www.spigotmc.org/resources/14153/) does not let floodgate add player prefix. * [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. From a64bb37caf64c9a65c13f05522d6360cabd7528b Mon Sep 17 00:00:00 2001 From: Jackson_57 <49173011+jackson-57@users.noreply.github.com> Date: Wed, 27 Apr 2022 19:38:36 -0700 Subject: [PATCH 019/118] Update versions.json (#39) --- _data/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/versions.json b/_data/versions.json index e27bd9f..e546f20 100644 --- a/_data/versions.json +++ b/_data/versions.json @@ -1,4 +1,4 @@ { - "bedrock": "1.18.0 - 1.18.30", + "bedrock": "1.18.0 - 1.18.31", "java": "1.18.2" } From 3ef2b3047af7f4d8092bbf47a0f06bbd808539f2 Mon Sep 17 00:00:00 2001 From: rtm516 Date: Thu, 28 Apr 2022 13:04:00 +0100 Subject: [PATCH 020/118] Fix test server commands table (fixes #40) --- _docs/other/test-server.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_docs/other/test-server.md b/_docs/other/test-server.md index c0d63df..6cb7974 100644 --- a/_docs/other/test-server.md +++ b/_docs/other/test-server.md @@ -16,8 +16,9 @@ If you can't build/destroy/interact with the world in the test server, run `/rtp If you have any questions or problems be sure to join our [Discord](https://discord.gg/geysermc)! ### Commands: + |Command|Desc| -|--|--| +|---|---| |`/rtp`|Teleport to a random location| |`/ll`|LandLord base command for managing land claims| |`/spawn`|Teleport to spawn| From 57528461563d00f7ac9125657123b744f0bb9a1b Mon Sep 17 00:00:00 2001 From: Triassic Date: Thu, 5 May 2022 23:20:02 +0300 Subject: [PATCH 021/118] Update providers.json (#42) --- _data/providers.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/_data/providers.json b/_data/providers.json index d3c8110..5fc75c9 100644 --- a/_data/providers.json +++ b/_data/providers.json @@ -223,11 +223,6 @@ "url": "https://hicoria.com/en/", "description": "Get Geyser as a plugin. Use the one of the available ports allocated for your server, for the Bedrock port in your config and connect with that port." }, - { - "name": "hokus", - "url": "https://hokus.me", - "description_template": "default" - }, { "name": "HostEZ", "url": "https://hostez.io/minecraft", From 051b2b19c190ab973bd6434dba77f7dd69a6dad8 Mon Sep 17 00:00:00 2001 From: Nicholas <102550462+ndisalvio3@users.noreply.github.com> Date: Fri, 6 May 2022 01:05:59 -0400 Subject: [PATCH 022/118] Update providers.json (#41) --- _data/providers.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/_data/providers.json b/_data/providers.json index 5fc75c9..8827e71 100644 --- a/_data/providers.json +++ b/_data/providers.json @@ -228,11 +228,6 @@ "url": "https://hostez.io/minecraft", "description": "Geyser plugin supported with self-install or installed on request with its own port. Includes firewall tested to be compatible with Geyser." }, - { - "name": "HostMC4Free", - "url": "https://hostmc4free.com", - "description": "Order new service, choose Geyser in Bedrock section, and open a ticket to request a second port all ports support UDP" - }, { "name": "HostValues", "url": "https://hostvalues.net/", From 26800288e504716457c108d18b7384501408ce05 Mon Sep 17 00:00:00 2001 From: Jens Collaert <63231928+Jens-Co@users.noreply.github.com> Date: Fri, 13 May 2022 13:45:04 +0200 Subject: [PATCH 023/118] Linking page fix & local serve fix (#45) --- Gemfile | 1 + Gemfile.lock | 2 ++ _data/toc.yml | 9 ++++---- _docs/floodgate/features.md | 44 ------------------------------------ _docs/floodgate/linking.md | 45 ++++++++++++++++++++++++++++++++++++- 5 files changed, 52 insertions(+), 49 deletions(-) diff --git a/Gemfile b/Gemfile index 1d7a3a7..d70c9b0 100644 --- a/Gemfile +++ b/Gemfile @@ -12,6 +12,7 @@ source "https://rubygems.org" # This is the default theme for new Jekyll sites. You may change this to anything you like. # gem "minima" +gem 'webrick' # If you want to use GitHub Pages, remove the "gem "jekyll"" above and # uncomment the line below. To upgrade, run `bundle update github-pages`. diff --git a/Gemfile.lock b/Gemfile.lock index 84226f4..22f6827 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -279,6 +279,7 @@ GEM unf_ext (0.0.8) unf_ext (0.0.8-x64-mingw32) unicode-display_width (1.8.0) + webrick (1.7.0) zeitwerk (2.5.4) PLATFORMS @@ -287,6 +288,7 @@ PLATFORMS DEPENDENCIES github-pages + webrick BUNDLED WITH 2.2.32 diff --git a/_data/toc.yml b/_data/toc.yml index 8b87e99..8f42672 100644 --- a/_data/toc.yml +++ b/_data/toc.yml @@ -55,10 +55,6 @@ url: "floodgate/features/#whitelist-command" - title: Global Api url: "floodgate/features/#what-is-the-global-api" - - title: Global Linking - url: "floodgate/features/#what-is-global-linking" - - title: Local Linking - url: "floodgate/features/#local-linking" - title: Skin Uploading url: "floodgate/features/#what-is-skin-uploading" - title: "Floodgate API" @@ -67,6 +63,11 @@ url: "floodgate/player/" - title: "Linking" url: "floodgate/linking/" + children: + - title: Global Linking + url: "floodgate/linking/#what-is-global-linking" + - title: Local Linking + url: "floodgate/linking/#local-linking" - title: "Forms and Cumulus" url: "floodgate/forms/" - title: "Commands" diff --git a/_docs/floodgate/features.md b/_docs/floodgate/features.md index 83ccd2c..c23f1fd 100644 --- a/_docs/floodgate/features.md +++ b/_docs/floodgate/features.md @@ -18,50 +18,6 @@ The permission node is `floodgate.command.whitelist`. The Global Api is an API that is available for every server. It currently includes: [Global Linking](#what-is-global-linking), [skin uploading](#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). -## What is Global Linking? -Instructions and information about how to link can also be found here: https://link.geysermc.org/ - -Before we introduced Global Linking, you always had to link your Java and Bedrock account on every individual server you visited (that has Floodgate). Global Linking is here to fix that problem. Link once, join everywhere.
-Global Linking is part of the [Global Api](#what-is-the-global-api) and uses the GlobalLinkServer to link your account. To be able to link your account you have to do the following: -1. Join the GlobalLinkServer with both your Java and Bedrock account - (IP: `link.geysermc.org`, Java port: `25565`, Bedrock port: `19132`) -2. Start the linking process by typing `/linkaccount` on your Java **or** Bedrock account -3. You'll get a message with a random number that you have to enter on the account that you did not start the linking process on. -4. Enter the random number on the other account by typing `/linkaccount ` -5. You should get kicked from the server on both your Bedrock and Java account with the message that it had successfully linked your accounts. - -Global Linking should be enabled by default on every server running Floodgate 2.0, but in the case that you disabled it, you can enable it again by opening your Floodgate config and make sure that the `player-link` section looks similar to this: -```yml -# Configuration for player linking -player-link: - # Whether to enable the linking system. Turning this off will prevent - # players from using the linking feature even if they are already linked. - enabled: true - # Whether to use global linking. Global linking uses a central server to request link - # accounts, allowing people to link once, join everywhere (on servers with global linking). - use-global-linking: true -``` -([see the default config](https://github.com/GeyserMC/Floodgate/blob/master/common/src/main/resources/config.yml)) - -Once you saved the config and restarted your server you should be using Global Linking. - -If you don't want to use Global Linking, you can disable `enable-global-linking` in the Floodgate config. - -### Local Linking -You can also set up a local linking database on your server. Local linking can work with Global Linking at the same time. Link entries in your local database will override entries in the Global Linking Server. - -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/). - 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. -4. Set `type` in the `player-link` section to your database type (currently either `mysql` or `sqlite`). (If you used Floodgate 1.0 and had linking enabled back then; the database type was `sqlite`). -5. Restart your server - -If you have selected `mysql` a new data folder for the database should be generated inside the Floodgate data folder. You can enter your database credentials in there. After you did that restart your server once more. - -That should be it. You can then link your accounts by following the instructions you get when typing `/linkaccount`. ## What is skin uploading? Skins of Bedrock player should be visible to Java players on servers with Floodgate 2.0 installed. diff --git a/_docs/floodgate/linking.md b/_docs/floodgate/linking.md index 579fb08..7055e3a 100644 --- a/_docs/floodgate/linking.md +++ b/_docs/floodgate/linking.md @@ -4,4 +4,47 @@ title: Linking permalink: /floodgate/linking/ --- -## TODO +## What is Global Linking? +Instructions and information about how to link can also be found here: https://link.geysermc.org/ + +Before we introduced Global Linking, you always had to link your Java and Bedrock account on every individual server you visited (that has Floodgate). Global Linking is here to fix that problem. Link once, join everywhere.
+Global Linking is part of the [Global Api](https://wiki.geysermc.org/floodgate/features/#what-is-the-global-api) and uses the GlobalLinkServer to link your account. To be able to link your account you have to do the following: +1. Join the GlobalLinkServer with both your Java and Bedrock account + (IP: `link.geysermc.org`, Java port: `25565`, Bedrock port: `19132`) +2. Start the linking process by typing `/linkaccount` on your Java **or** Bedrock account +3. You'll get a message with a random number that you have to enter on the account that you did not start the linking process on. +4. Enter the random number on the other account by typing `/linkaccount ` +5. You should get kicked from the server on both your Bedrock and Java account with the message that it had successfully linked your accounts. + +Global Linking should be enabled by default on every server running Floodgate 2.0, but in the case that you disabled it, you can enable it again by opening your Floodgate config and make sure that the `player-link` section looks similar to this: +```yml +# Configuration for player linking +player-link: + # Whether to enable the linking system. Turning this off will prevent + # players from using the linking feature even if they are already linked. + enabled: true + # Whether to use global linking. Global linking uses a central server to request link + # accounts, allowing people to link once, join everywhere (on servers with global linking). + use-global-linking: true +``` +([see the default config](https://github.com/GeyserMC/Floodgate/blob/master/common/src/main/resources/config.yml)) + +Once you saved the config and restarted your server you should be using Global Linking. + +If you don't want to use Global Linking, you can disable `enable-global-linking` in the Floodgate config. + +## Local Linking +You can also set up a local linking database on your server. Local linking can work with Global Linking at the same time. Link entries in your local database will override entries in the Global Linking Server. + +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/). + 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. +4. Set `type` in the `player-link` section to your database type (currently either `mysql` or `sqlite`). (If you used Floodgate 1.0 and had linking enabled back then; the database type was `sqlite`). +5. Restart your server + +If you have selected `mysql` a new data folder for the database should be generated inside the Floodgate data folder. You can enter your database credentials in there. After you did that restart your server once more. + +That should be it. You can then link your accounts by following the instructions you get when typing `/linkaccount`. From 5e9281be8bfb4df21366cd709fe4ec78d3b6cb80 Mon Sep 17 00:00:00 2001 From: rtm516 Date: Sun, 15 May 2022 15:58:15 +0100 Subject: [PATCH 024/118] Fix project links on sidebar (closes #35) --- Gemfile | 2 ++ Gemfile.lock | 2 ++ _config.yml | 2 +- _includes/editable.html | 2 +- _includes/header.html | 2 +- 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index d70c9b0..03b5892 100644 --- a/Gemfile +++ b/Gemfile @@ -22,3 +22,5 @@ gem "github-pages", group: :jekyll_plugins # group :jekyll_plugins do # gem "jekyll-github-metadata", "~> 1.0" # end + +gem 'wdm', '>= 0.1.0' if Gem.win_platform? diff --git a/Gemfile.lock b/Gemfile.lock index 22f6827..3fe8196 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -279,6 +279,7 @@ GEM unf_ext (0.0.8) unf_ext (0.0.8-x64-mingw32) unicode-display_width (1.8.0) + wdm (0.1.1) webrick (1.7.0) zeitwerk (2.5.4) @@ -288,6 +289,7 @@ PLATFORMS DEPENDENCIES github-pages + wdm (>= 0.1.0) webrick BUNDLED WITH diff --git a/_config.yml b/_config.yml index 52d1157..0b01b31 100644 --- a/_config.yml +++ b/_config.yml @@ -28,7 +28,7 @@ url: "https://wiki.geysermc.org" # the base hostname & protocol for your site # Social (First three Required) repo: "https://github.com/GeyserMC/GeyserWiki" github_user: "GeyserMC" -github_repo: "GeyserWiki" +github_repo: "Geyser" github_branch: "master" # Optional diff --git a/_includes/editable.html b/_includes/editable.html index e89d8b0..92e81a0 100644 --- a/_includes/editable.html +++ b/_includes/editable.html @@ -1,6 +1,6 @@ Edit this page Create documentation issue - Create project issue + Create project issue diff --git a/_includes/header.html b/_includes/header.html index 71368fe..583f9db 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -16,7 +16,7 @@
- +
{{ site.github_user }}/{{ site.github_repo }} From c0bc1e677803b4d8d86d7c87820255c82226c04b Mon Sep 17 00:00:00 2001 From: rtm516 Date: Sun, 15 May 2022 19:08:36 +0100 Subject: [PATCH 025/118] Fix footer icons and GitHub header --- _includes/footer.html | 53 +++++++++++++++++++------------------------ _includes/header.html | 4 ++-- _sass/github.scss | 6 ----- 3 files changed, 25 insertions(+), 38 deletions(-) diff --git a/_includes/footer.html b/_includes/footer.html index 1e78cca..93d0eab 100755 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,37 +1,30 @@ diff --git a/_includes/header.html b/_includes/header.html index 583f9db..ec68c92 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -32,11 +32,11 @@ $(document).ready(function() { var url = "https://api.github.com/search/repositories?q={{ site.github_user }}/{{ site.github_repo }}"; fetch(url, { - headers: {"Accept":"application/vnd.github.preview"} + headers: {"Accept":"application/vnd.github.v3+json"} }).then(function(e) { return e.json() }).then(function(r) { - console.log(r.items[0]) + if (r.items[0].full_name !== "{{ site.github_user }}/{{ site.github_repo }}") return stars = r.items[0]['stargazers_count'] forks = r.items[0]['forks_count'] $('#stars').text(stars + " Stars") diff --git a/_sass/github.scss b/_sass/github.scss index f0fe8b2..0e07f14 100644 --- a/_sass/github.scss +++ b/_sass/github.scss @@ -56,12 +56,6 @@ -webkit-animation: md-source__fact--done .4s ease-out; animation: md-source__fact--done .4s ease-out; } -.gh-source__fact:before { - margin: 0 .2rem; - content: "\B7"} -.gh-source__fact:first-child:before { - display: none; -} .gh-source-file { display: inline-block; margin: 1em .5em 1em 0; From 48ba0f9023f1c3f02fc9b3e9d22bfe37f1ed94e8 Mon Sep 17 00:00:00 2001 From: Jens Collaert <63231928+Jens-Co@users.noreply.github.com> Date: Mon, 16 May 2022 10:05:50 +0200 Subject: [PATCH 026/118] fix #undefined dead TOC links on index page. (#46) --- pages/index.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pages/index.md b/pages/index.md index 0c41d2e..11067d1 100644 --- a/pages/index.md +++ b/pages/index.md @@ -11,7 +11,7 @@ permalink: /
geyser logo -

Revolutionize Your Minecraft Server

+

Revolutionize Your Minecraft Server

Enable clients from Minecraft Bedrock Edition to join your Minecraft Java server.

@@ -22,7 +22,7 @@ permalink: /
-

What is Geyser?

+

What is Geyser?

Geyser is a proxy, bridging the gap between Minecraft: Bedrock Edition and Minecraft: Java Edition servers. The ultimate goal of this project is to allow Minecraft: Bedrock Edition users to join Minecraft: Java Edition servers as seamlessly as possible to allow for true cross-platform.

@@ -38,7 +38,7 @@ permalink: /
-

How do I use it?

+

How do I use it?

Geyser can be downloaded from our Jenkins server here and setup installations can be found on our wiki or in the tutorial video. Geyser can be used to join any modern Java server and doesn't require anything extra to be done on their end.

@@ -48,7 +48,7 @@ permalink: /
-

How does it work?

+

How does it work?

Geyser is a middleware, which translates all the incoming and outgoing packets. With this being said, Geyser works as a standalone proxy, meaning you can use it to join any modern Minecraft Java server. Geyser can also be installed on your server as a plugin, so you can easily make your server compatible with Minecraft: Bedrock Edition.

@@ -61,7 +61,7 @@ permalink: /
-

Join from anywhere

+

Join from anywhere

Geyser can be joined from Windows 10, iOS, Android, and even consoles (see here for how to set this up!) Geyser is tested working with a From 9a071672aca2a86cb2cfcf0a9005af338622a61d Mon Sep 17 00:00:00 2001 From: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Mon, 16 May 2022 12:47:18 -0400 Subject: [PATCH 027/118] Replace userAuths with saved-user-logins --- _docs/geyser/understanding-the-config.md | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/_docs/geyser/understanding-the-config.md b/_docs/geyser/understanding-the-config.md index b2c25b2..5342713 100644 --- a/_docs/geyser/understanding-the-config.md +++ b/_docs/geyser/understanding-the-config.md @@ -45,19 +45,20 @@ General Geyser options that are mostly specific to Geyser itself. **`floodgate-key-file`**: The key file path for Floodgate. Requires that you have [Floodgate](/floodgate/) installed and the `auth-type` set to `floodgate`. -**`userAuths`**: A section where you can put the authentication information for your Minecraft: Java Edition account for immediate login when joining Geyser. **It is advised you ONLY use this option if you are running Geyser locally and that ONLY you have access to the config as it requires you put your Minecraft: Java Edition credentials in plain text!** +**`saved-user-logins`**: For online mode authentication type only. +Stores a list of Bedrock players that should have their Java Edition account saved after login. +This saves a token that can be reused to authenticate the player later. This does not save emails or passwords, +but you should still be cautious when adding to this list and giving others access to this Geyser instance's files. +Removing a name from this list will delete its cached login information on the next Geyser startup. +The file for this is in the same folder as this config, named `saved-refresh-tokens.json`. -If your Xbox account name was Notch, your Java email was `foobar2000@gmail.com` and your password was `hunter2`, you would fill this into the config: +Format: +```yml +saved-user-logins: + - jeb_ + - Dinnerbone ``` -userAuths: - Notch: # MCPE/Xbox username - email: foobar2000@gmail.com - password: "hunter2" - microsoft-account: true -``` - -Put two spaces before the username and four spaces before the email and password. **`command-suggestions`**: Bedrock clients freeze or crash when opening up the command prompt for the first time with a large amount of command suggestions. This config option disables command suggestions being sent to prevent any freezing. **Since 1.16.100:** command freezing and crashing has been largely reduced; you may no longer need this option disabled. From 5dea5a518e3b8b9c8bd1f18663f2d09c93affb42 Mon Sep 17 00:00:00 2001 From: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Mon, 16 May 2022 18:07:36 -0400 Subject: [PATCH 028/118] Add information about custom locale overrides --- _docs/geyser/faq.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/_docs/geyser/faq.md b/_docs/geyser/faq.md index 363566c..4cf52be 100644 --- a/_docs/geyser/faq.md +++ b/_docs/geyser/faq.md @@ -191,6 +191,21 @@ We aim to support any of the bedrock languages; see [here](https://translate.gey |Hebrew |he_il| |Hindi |hi_in| +## Adding custom Geyser translation overrides + +As of Geyser build #1101, you can now +specify custom translations for Geyser strings used within the project. + +Please note that you cannot add strings that work in Minecraft formatting - these strings are only for +places where Geyser uses them. + +To start, create a `languages` folder in the same directory as the Geyser config file. +Inside of it, you'll need to add a file with your desired locale ending in `.properties`. You can see +[here](https://github.com/GeyserMC/languages/tree/master/texts) for the locale files that Geyser uses - +you can download these as a starting point, or you can just add the strings you want to overwrite. + +You must restart Geyser for the changes to apply. + # Questions not related to gameplay ## What is the relationship between CubeCraft and Geyser? From 80702ea9f087cf4e58700e40c4d36469c2af85a2 Mon Sep 17 00:00:00 2001 From: JensC Date: Tue, 17 May 2022 15:46:52 +0200 Subject: [PATCH 029/118] Adding GeyserHacks and fix alphabetical order --- _docs/other/community-geyser-projects.md | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/_docs/other/community-geyser-projects.md b/_docs/other/community-geyser-projects.md index 86ad60b..4ba66ba 100644 --- a/_docs/other/community-geyser-projects.md +++ b/_docs/other/community-geyser-projects.md @@ -61,6 +61,12 @@ Plugin that blocks Java players from joining your Geyser server, so you can have Creator: [Camotoy](https://github.com/Camotoy) +## GeyserHacks +Various workarounds for Geyser players that modify the server in order to achieve their goal. +* [GitHub](https://github.com/Camotoy/GeyserHacks) + +Creator: [Camotoy](https://github.com/Camotoy) + ## GeyserHub A crossplay lobby plugin that provides server selector and command forms for both Bedrock Edition and Java Edition players. @@ -82,12 +88,6 @@ Prevent Bedrock players from joining specific sub-servers on a proxy Creator: [Camotoy](https://github.com/Camotoy) -## TydiumCraft Skin API -An API makes it easier for your Bedrock skin to be rendered and outputted! -* [Website](https://tydiumcraft.net/docs/skinapi) - -Creators: [Tydium](https://github.com/Tydium), [higbead](https://github.com/higbead), [gibbon27](https://github.com/gibbon27) - ## GeyserSkinManager Spigot and Bungee plugin to make Bedrock skins work; requires Geyser to be installed on the server. * [GitHub](https://github.com/Camotoy/GeyserSkinManager) @@ -107,3 +107,9 @@ Small application that waits for a player to connect before launching actual min * [GitHub](https://github.com/vincss/mcsleepingserverstarter) Creator: [Vincss](https://github.com/vincss) + +## TydiumCraft Skin API +An API makes it easier for your Bedrock skin to be rendered and outputted! +* [Website](https://tydiumcraft.net/docs/skinapi) + +Creators: [Tydium](https://github.com/Tydium), [higbead](https://github.com/higbead), [gibbon27](https://github.com/gibbon27) From f19e45f053325af783a0fe2dae2ae40f8ba5b489 Mon Sep 17 00:00:00 2001 From: Adam Chance <6444703+SocMinarch@users.noreply.github.com> Date: Thu, 19 May 2022 17:22:05 +0100 Subject: [PATCH 030/118] Add Oracle Cloud to providers.json (#47) * Add Oracle Cloud to providers.json * Elaborate further on OCI port forwarding * Add an extra note for fixing UFW on Ubuntu --- _data/providers.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/_data/providers.json b/_data/providers.json index 8827e71..d2f956d 100644 --- a/_data/providers.json +++ b/_data/providers.json @@ -298,6 +298,11 @@ "url": "https://play.nxyl.pro", "description": "Get Geyser as a plugin. Put the port provided by the host in your config.yml for the Java and bedrock sections, or create a port in the ports manager on the panel and use that for bedrock with the main one for Java, and you will be able to connect!" }, + { + "name": "Oracle Cloud", + "url": "https://www.oracle.com/cloud/", + "description": "Not a dedicated Minecraft provider\n - 30 day/$300 free trial\n - [Tutorial for a Minecraft server in Oracle Cloud](https://blogs.oracle.com/developers/post/how-to-set-up-and-run-a-really-powerful-free-minecraft-server-in-the-cloud)\n - Note: You'll need to also allow port 19132 on UDP in both the security list and the firewall-cmd command, use Paper instead of vanilla, and put Geyser in the plugins folder.\n -- Note for Ubuntu users: Comment out `-A INPUT -j REJECT --reject-with icmp-host-prohibited` in `/etc/iptables/rules.v4` and run `sudo iptables-restore < /etc/iptables/rules.v4` to fix ufw." + }, { "name": "OVH", "url": "https://www.ovh.com/", From 14748941495e5289c02669204f1e433fe0bb16c0 Mon Sep 17 00:00:00 2001 From: Konicai <71294714+Konicai@users.noreply.github.com> Date: Mon, 23 May 2022 13:45:57 -0400 Subject: [PATCH 031/118] Update community-geyser-projects.md (#48) --- _docs/other/community-geyser-projects.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/_docs/other/community-geyser-projects.md b/_docs/other/community-geyser-projects.md index 4ba66ba..807dda6 100644 --- a/_docs/other/community-geyser-projects.md +++ b/_docs/other/community-geyser-projects.md @@ -31,6 +31,13 @@ A Spigot plugin that is able to run certain commands when a Bedrock player joins Creator: ofunny +## CrossplatForms +A Spigot, BungeeCord, and Velocity plugin to create custom Bedrock Edition forms and inventory menus through configurations. +* [Spigot page](https://www.spigotmc.org/resources/101043/) +* [GitHub](https://github.com/ProjectG-Plugins/CrossplatForms) + +Creators: [Konicai](https://github.com/Konicai), [Jens](https://github.com/Jens-Co) + ## CustomCommandPrefix A Spigot plugin that allows users to enter commands starting with `.`, to work around Xbox achievements being disabled. @@ -67,13 +74,6 @@ Various workarounds for Geyser players that modify the server in order to achiev Creator: [Camotoy](https://github.com/Camotoy) -## GeyserHub -A crossplay lobby plugin that provides server selector and command forms for both Bedrock Edition and Java Edition players. - -* [Github](https://github.com/ProjectG-Plugins/GeyserHub) - -Creators: [Jens](https://github.com/Jens-Co), [Konicai](https://github.com/Konicai) - ## GeyserPlaceholders Placeholders support for Geyser. From 579cbd0a92b92ac4337213392f7b24e7b2deb16c Mon Sep 17 00:00:00 2001 From: Anthony Date: Thu, 2 Jun 2022 12:28:52 -0400 Subject: [PATCH 032/118] Update providers.json (#49) --- _data/providers.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/_data/providers.json b/_data/providers.json index d2f956d..f5dcc76 100644 --- a/_data/providers.json +++ b/_data/providers.json @@ -349,6 +349,11 @@ "url": "https://revivenode.com/", "description_template": "default" }, + { + "name": "SunriseNode", + "url": "https://sunrisenode.com", + "description": "Get Geyser as a plugin. Use the same port as your Java server for the Bedrock port in your config and connect with that port." + }, { "name": "ScalaCube", "url": "https://scalacube.com/", From dd43ba87aa04e5faefc2ebdc499e0f6cd38abb71 Mon Sep 17 00:00:00 2001 From: Jens Collaert <63231928+Jens-Co@users.noreply.github.com> Date: Sun, 12 Jun 2022 01:53:37 +0200 Subject: [PATCH 033/118] Update Domain ProjectG -> kejonaMC (#53) --- _docs/other/community-geyser-projects.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/_docs/other/community-geyser-projects.md b/_docs/other/community-geyser-projects.md index 807dda6..9589290 100644 --- a/_docs/other/community-geyser-projects.md +++ b/_docs/other/community-geyser-projects.md @@ -34,7 +34,7 @@ Creator: ofunny ## CrossplatForms A Spigot, BungeeCord, and Velocity plugin to create custom Bedrock Edition forms and inventory menus through configurations. * [Spigot page](https://www.spigotmc.org/resources/101043/) -* [GitHub](https://github.com/ProjectG-Plugins/CrossplatForms) +* [GitHub](https://github.com/kejonaMC/CrossplatForms) Creators: [Konicai](https://github.com/Konicai), [Jens](https://github.com/Jens-Co) @@ -57,14 +57,14 @@ Creator: [rtm516](https://github.com/rtm516) ## Floodgate-Skript Floodgate support for Skript. -* [GitHub](https://github.com/Camotoy/floodgate-skript) +* [GitHub](https://github.com/kejonaMC/floodgate-skript) Creator: [Camotoy](https://github.com/Camotoy) ## GeyserBlockJavaPlayers Plugin that blocks Java players from joining your Geyser server, so you can have a Bedrock only server that can use Spigot plugins. -* [GitHub](https://github.com/Camotoy/GeyserBlockJavaPlayers) +* [GitHub](https://github.com/kejonaMC/GeyserBlockJavaPlayers) Creator: [Camotoy](https://github.com/Camotoy) @@ -84,7 +84,7 @@ Creator: [ImDaBigBoss](https://github.com/ImDaBigBoss) ## GeyserPreventServerSwitch Prevent Bedrock players from joining specific sub-servers on a proxy -* [GitHub](https://github.com/Camotoy/GeyserPreventServerSwitch) +* [GitHub](https://github.com/kejonaMC/GeyserPreventServerSwitch) Creator: [Camotoy](https://github.com/Camotoy) @@ -97,7 +97,7 @@ Creator: [Camotoy](https://github.com/Camotoy) ## GeyserUpdater This is a Spigot/BungeeCord/Velocity plugin that can be used to automatically update Geyser. -* [GitHub](https://github.com/ProjectG-Plugins/GeyserUpdater) +* [GitHub](https://github.com/kejonaMC/GeyserUpdater) * [Spigot page](https://www.spigotmc.org/resources/88555/) Creators: [Jens](https://github.com/Jens-Co), [YHDiamond](https://github.com/YHDiamond), [Konicai](https://github.com/Konicai) From 46e9599917865fc06cfa4b99bb89defa8d8bc5d2 Mon Sep 17 00:00:00 2001 From: Olivia Date: Mon, 13 Jun 2022 10:44:28 -0500 Subject: [PATCH 034/118] Allow mods/triage to edit _data/ (#55) --- .github/CODEOWNERS | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index e02cacf..ff63943 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,2 +1,3 @@ _docs/ @GeyserMC/Moderators @GeyserMC/WikiAdmin @GeyserMC/Triage @GeyserMC/GeyserTeam +_data/ @GeyserMC/Moderators @GeyserMC/WikiAdmin @GeyserMC/Triage @GeyserMC/GeyserTeam * @GeyserMC/WikiAdmin @GeyserMC/GeyserTeam From d2917d9530ca8ba0755fdd9cf9aebf15ae53531f Mon Sep 17 00:00:00 2001 From: 7man7LMYT <67489949+7man7LMYT@users.noreply.github.com> Date: Mon, 13 Jun 2022 09:44:01 -0700 Subject: [PATCH 035/118] Add MixmlHosting (#54) --- _data/providers.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/_data/providers.json b/_data/providers.json index f5dcc76..c43eac1 100644 --- a/_data/providers.json +++ b/_data/providers.json @@ -53,6 +53,11 @@ "url": "https://minehut.com/", "description": "Connect via `bedrock.minehut.com` and do `/join `." }, + { + "name": "MixmlHosting", + "url": "https://mixmlhosting.com/", + "description_template": "default" + }, { "name": "OMGServ", "url": "https://www.omgserv.com/en/", From 0235ebfe6fe29d5ced3bdefd29403aa42c02f4af Mon Sep 17 00:00:00 2001 From: TheMonBon <71078643+TheMonBonGH@users.noreply.github.com> Date: Tue, 14 Jun 2022 14:53:28 -0500 Subject: [PATCH 036/118] Open anticheat links in new tab (#51) --- _docs/geyser/anticheat-compatibility.md | 36 ++++++++++++------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/_docs/geyser/anticheat-compatibility.md b/_docs/geyser/anticheat-compatibility.md index 341baf9..8decd06 100644 --- a/_docs/geyser/anticheat-compatibility.md +++ b/_docs/geyser/anticheat-compatibility.md @@ -10,27 +10,27 @@ Do note that this is a community-compiled list and is incomplete! If you wish to Full Compatibility (Checks Bedrock Players Accurately) -- [AntiAura](https://www.spigotmc.org/resources/1368/) (Paid) - Last Updated on 19th August 2021 -- [Themis](https://www.spigotmc.org/resources/90766/) - Last Updated on 19th August 2021 -- [LightAntiCheat](https://www.spigotmc.org/resources/96341/) - Last Updated on 4th December 2021 -- [Negativity V2](https://www.spigotmc.org/resources/86874/) (Paid) - Last Updated on 21st March 2022 -- [SoaromaSAC](https://www.spigotmc.org/resources/87702/) - Last Updated on 27th March 2022 +- [AntiAura](https://www.spigotmc.org/resources/1368/){:target="_blank"} (Paid) - Last Updated on 19th August 2021 +- [Themis](https://www.spigotmc.org/resources/90766/){:target="_blank"} - Last Updated on 19th August 2021 +- [LightAntiCheat](https://www.spigotmc.org/resources/96341/){:target="_blank"} - Last Updated on 4th December 2021 +- [Negativity V2](https://www.spigotmc.org/resources/86874/){:target="_blank"} (Paid) - Last Updated on 21st March 2022 +- [SoaromaSAC](https://www.spigotmc.org/resources/87702/){:target="_blank"} - Last Updated on 27th March 2022 Partially Compatible (Does not Check/Ignores Bedrock Players) -- [AAC](https://www.spigotmc.org/resources/6442/) (Paid) - Last Updated on 19th August 2021 -- [Flappy Anticheat](https://www.spigotmc.org/resources/92180/) - Last Updated on 14th September 2021 -- [GrimAC](https://github.com/MWHunter/Grim) - Last Updated on 24th March 2022 -- [Matrix](https://matrix.rip/) (Paid) - Last updated on 2nd September 2021 -- [Spartan](https://www.spigotmc.org/resources/25638/) (Spartan Syn offers full Bedrock checks for an additional $43) (Paid) - Last Updated on 19th August 2021 -- [Vulcan](https://www.spigotmc.org/resources/83626/) (Paid) - Last Updated on 19th August 2021 +- [AAC](https://www.spigotmc.org/resources/6442/){:target="_blank"} (Paid) - Last Updated on 19th August 2021 +- [Flappy Anticheat](https://www.spigotmc.org/resources/92180/){:target="_blank"} - Last Updated on 14th September 2021 +- [GrimAC](https://github.com/MWHunter/Grim){:target="_blank"} - Last Updated on 24th March 2022 +- [Matrix](https://matrix.rip/){:target="_blank"} (Paid) - Last updated on 2nd September 2021 +- [Spartan](https://www.spigotmc.org/resources/25638/){:target="_blank"} (Spartan Syn offers full Bedrock checks for an additional $43) (Paid) - Last Updated on 19th August 2021 +- [Vulcan](https://www.spigotmc.org/resources/83626/){:target="_blank"} (Paid) - Last Updated on 19th August 2021 Incompatible (False Positives on Bedrock Players, no Compatibility at All) -- [AntiCheatReloaded](https://www.spigotmc.org/resources/23799/) - Last Updated on 19th August 2021 -- [Negativity V1](https://www.spigotmc.org/resources/48399/) - Last Updated on 21st March 2022 -- [NoCheatPlus](https://ci.codemc.io/job/Updated-NoCheatPlus/job/Updated-NoCheatPlus/) ([Compat NCP](https://github.com/Updated-NoCheatPlus/CompatNoCheatPlus/) is an addon that enables Partial Compatibility) - Last Updated on 19th August 2021 -- [GodsEye](https://www.spigotmc.org/resources/69595/) ([GodsEyeGeyserMC](https://github.com/TheDejavu/GodsEyeGeyserMC/releases) is an addon that enables Partial Compatibility) (Paid) - Last Updated on 21st March 2022 -- [Kauri](https://www.spigotmc.org/resources/53721/) (Paid) - Last Updated on 21st March 2022 -- [Reflex](https://www.spigotmc.org/resources/21122/) (Paid) - Last Updated on 19th August 2021 -- [Wraith](https://www.spigotmc.org/resources/66887/) (Paid) - Last Updated on 19th August 2021 +- [AntiCheatReloaded](https://www.spigotmc.org/resources/23799/){:target="_blank"} - Last Updated on 19th August 2021 +- [Negativity V1](https://www.spigotmc.org/resources/48399/){:target="_blank"} - Last Updated on 21st March 2022 +- [NoCheatPlus](https://ci.codemc.io/job/Updated-NoCheatPlus/job/Updated-NoCheatPlus/){:target="_blank"} ([Compat NCP](https://github.com/Updated-NoCheatPlus/CompatNoCheatPlus/){:target="_blank"} is an addon that enables Partial Compatibility) - Last Updated on 19th August 2021 +- [GodsEye](https://www.spigotmc.org/resources/69595/){:target="_blank"} ([GodsEyeGeyserMC](https://github.com/TheDejavu/GodsEyeGeyserMC/releases){:target="_blank"} is an addon that enables Partial Compatibility) (Paid) - Last Updated on 21st March 2022 +- [Kauri](https://www.spigotmc.org/resources/53721/){:target="_blank"} (Paid) - Last Updated on 21st March 2022 +- [Reflex](https://www.spigotmc.org/resources/21122/){:target="_blank"} (Paid) - Last Updated on 19th August 2021 +- [Wraith](https://www.spigotmc.org/resources/66887/){:target="_blank"} (Paid) - Last Updated on 19th August 2021 From cc423245d7d34b40665ee7d45c5ccbed41da115a Mon Sep 17 00:00:00 2001 From: byquanton <32410361+byquanton@users.noreply.github.com> Date: Tue, 14 Jun 2022 22:20:07 +0200 Subject: [PATCH 037/118] Update versions.json (#56) --- _data/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_data/versions.json b/_data/versions.json index e546f20..c472398 100644 --- a/_data/versions.json +++ b/_data/versions.json @@ -1,4 +1,4 @@ { - "bedrock": "1.18.0 - 1.18.31", - "java": "1.18.2" + "bedrock": "1.19.0", + "java": "1.19" } From 517067296d18aec1e321fb17b49098c5c4887b73 Mon Sep 17 00:00:00 2001 From: byquanton <32410361+byquanton@users.noreply.github.com> Date: Fri, 17 Jun 2022 15:36:35 +0200 Subject: [PATCH 038/118] Replace AdoptOpenJdk with Adoptium (#57) --- _docs/geyser/common-issues.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_docs/geyser/common-issues.md b/_docs/geyser/common-issues.md index ad10301..1dbb555 100644 --- a/_docs/geyser/common-issues.md +++ b/_docs/geyser/common-issues.md @@ -41,7 +41,7 @@ This usually has something to do on your host's end. Most commonly, it's because # Stuck on "Locating Server" with no errors -You may need to update your Java version. If so, update at [AdoptOpenJDK.net](https://adoptopenjdk.net/). +You may need to update your Java version. If so, update at [Adoptium.net](https://adoptium.net/). Sometimes this happens in poor-network environments. There is an `mtu` option in the Geyser config; lower this number slowly (in batches of 100), restart each time, and re-test joining. From c27f9f4123383022d9008226b9c7878a8cceff65 Mon Sep 17 00:00:00 2001 From: Jackson_57 <49173011+jackson-57@users.noreply.github.com> Date: Thu, 23 Jun 2022 18:17:37 -0700 Subject: [PATCH 039/118] Add OCI suffix to Oracle Cloud entry (#58) --- _data/providers.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/providers.json b/_data/providers.json index c43eac1..9b1ba71 100644 --- a/_data/providers.json +++ b/_data/providers.json @@ -304,7 +304,7 @@ "description": "Get Geyser as a plugin. Put the port provided by the host in your config.yml for the Java and bedrock sections, or create a port in the ports manager on the panel and use that for bedrock with the main one for Java, and you will be able to connect!" }, { - "name": "Oracle Cloud", + "name": "Oracle Cloud / OCI", "url": "https://www.oracle.com/cloud/", "description": "Not a dedicated Minecraft provider\n - 30 day/$300 free trial\n - [Tutorial for a Minecraft server in Oracle Cloud](https://blogs.oracle.com/developers/post/how-to-set-up-and-run-a-really-powerful-free-minecraft-server-in-the-cloud)\n - Note: You'll need to also allow port 19132 on UDP in both the security list and the firewall-cmd command, use Paper instead of vanilla, and put Geyser in the plugins folder.\n -- Note for Ubuntu users: Comment out `-A INPUT -j REJECT --reject-with icmp-host-prohibited` in `/etc/iptables/rules.v4` and run `sudo iptables-restore < /etc/iptables/rules.v4` to fix ufw." }, From b8fa595c16af26e545c01112efd5d91b81d7079e Mon Sep 17 00:00:00 2001 From: drori200 <32238971+drori200@users.noreply.github.com> Date: Tue, 28 Jun 2022 16:37:00 +0300 Subject: [PATCH 040/118] Minor changes to faq.md (#61) * Update faq.md Added a few words to better the explanation about converting Java resource packs to Bedrock and add an hyper link to the tool * Update faq.md Fix a typo * Update faq.md --- _docs/geyser/faq.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_docs/geyser/faq.md b/_docs/geyser/faq.md index 4cf52be..39ec04d 100644 --- a/_docs/geyser/faq.md +++ b/_docs/geyser/faq.md @@ -59,7 +59,7 @@ Generally, the IP that Bedrock players will join with is your Java IP and the de ## How can I have Bedrock players load resource packs? -You can add Bedrock resource packs to your Geyser installation in the `packs` folder of wherever the Geyser config is located. Bedrock clients will automatically download and load those resource packs. There is currently no automatic Java-to-Bedrock resource pack conversion, but you can convert any Java resource pack https://rtm516.github.io/ConvertJavaTextureToBedrock/ and add that to your server. +You can add Bedrock resource packs to your Geyser installation in the `packs` folder of wherever the Geyser config is located. Bedrock clients will automatically download and load those resource packs. There is currently no automatic Java-to-Bedrock resource pack conversion, but you can convert any Java resource pack to Bedrock using [this tool](https://rtm516.github.io/ConvertJavaTextureToBedrock/) and add that to your server. ## How can Bedrock players hold items in their offhand? From 90552f9817bdd383222e08ab85d46091d6ab6835 Mon Sep 17 00:00:00 2001 From: 7man7LMYT <67489949+7man7LMYT@users.noreply.github.com> Date: Tue, 28 Jun 2022 12:57:15 -0700 Subject: [PATCH 041/118] connector -> core (#62) --- _docs/other/developer-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_docs/other/developer-guide.md b/_docs/other/developer-guide.md index 4ebe9a5..580dd6b 100644 --- a/_docs/other/developer-guide.md +++ b/_docs/other/developer-guide.md @@ -12,7 +12,7 @@ permalink: /other/developer-guide/ ## Project layout * `bootstrap` is where we hold the specific platform code. So if you're porting Geyser to a new platform, or working with platform-specific code, you likely want to be in here. -* `connector` is where connections are handled and the data conversion is done. The majority of Geyser work is held here. +* `core` is where connections are handled and the data conversion is done. The majority of Geyser work is held here. # Compiler Tools From 022073bdaace8b7609420e0639a2c85aeefba306 Mon Sep 17 00:00:00 2001 From: Konicai <71294714+Konicai@users.noreply.github.com> Date: Wed, 6 Jul 2022 18:40:10 -0400 Subject: [PATCH 042/118] Update paper config name (#60) * paper.yml -> paper-global.yml * Indicate file on <1.19 * Update issues.md --- _docs/floodgate/issues.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_docs/floodgate/issues.md b/_docs/floodgate/issues.md index da0da8b..d4b2880 100644 --- a/_docs/floodgate/issues.md +++ b/_docs/floodgate/issues.md @@ -46,7 +46,7 @@ Set `allow-invalid-usernames` to `true` in LuckPerms' config. ## Failed to verify username! (with Paper) -To completely mitigate this issue, disable `perform-username-validation` in the [unsupported settings in the `paper.yml` config file](https://paper.readthedocs.io/en/latest/server/configuration.html#unsupported-settings). Using Floodgate on the backend servers will also mitigate this issue. +To completely mitigate this issue, disable `perform-username-validation` in the [unsupported settings of the `config/paper-global.yml` file](https://paper.readthedocs.io/en/latest/server/configuration.html#unsupported-settings) (`paper.yml` in the root server folder on servers below 1.19). Using Floodgate on the backend servers will also mitigate this issue. ## Error with Forge or Fabric Bukkit Hybrid From a65f9653b5a33914eeab01aa221f0175f9d12464 Mon Sep 17 00:00:00 2001 From: JustCallMeQuincy <71931404+JustCallMeQuincy@users.noreply.github.com> Date: Thu, 7 Jul 2022 00:40:36 +0200 Subject: [PATCH 043/118] Updated Themis' "last updated" date (#65) --- _docs/geyser/anticheat-compatibility.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_docs/geyser/anticheat-compatibility.md b/_docs/geyser/anticheat-compatibility.md index 8decd06..e94f13c 100644 --- a/_docs/geyser/anticheat-compatibility.md +++ b/_docs/geyser/anticheat-compatibility.md @@ -11,7 +11,7 @@ Do note that this is a community-compiled list and is incomplete! If you wish to Full Compatibility (Checks Bedrock Players Accurately) - [AntiAura](https://www.spigotmc.org/resources/1368/){:target="_blank"} (Paid) - Last Updated on 19th August 2021 -- [Themis](https://www.spigotmc.org/resources/90766/){:target="_blank"} - Last Updated on 19th August 2021 +- [Themis](https://www.spigotmc.org/resources/90766/){:target="_blank"} - Last Updated on 15th Jun 2022 - [LightAntiCheat](https://www.spigotmc.org/resources/96341/){:target="_blank"} - Last Updated on 4th December 2021 - [Negativity V2](https://www.spigotmc.org/resources/86874/){:target="_blank"} (Paid) - Last Updated on 21st March 2022 - [SoaromaSAC](https://www.spigotmc.org/resources/87702/){:target="_blank"} - Last Updated on 27th March 2022 From 866b727de0d1f5cf20fdb73b7dbb1821520675e9 Mon Sep 17 00:00:00 2001 From: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Thu, 14 Jul 2022 16:59:01 -0400 Subject: [PATCH 044/118] Update Geyser-Fabric download link --- _docs/other/geyser-fabric.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_docs/other/geyser-fabric.md b/_docs/other/geyser-fabric.md index 7d9cd84..74358b8 100644 --- a/_docs/other/geyser-fabric.md +++ b/_docs/other/geyser-fabric.md @@ -4,7 +4,7 @@ title: Geyser-Fabric permalink: /other/geyser-fabric/ --- -# [Download here](https://ci.opencollab.dev/job/GeyserMC/job/Geyser-Fabric/job/java-1.18/) +# [Download here](https://ci.opencollab.dev/job/GeyserMC/job/Geyser-Fabric/job/master/) For the most part, Geyser-Fabric operates the same as other Geyser platforms. There are a couple of exceptions: From c6ecc0ee04f04ffd8a9168aa48c9a6bb2a767b96 Mon Sep 17 00:00:00 2001 From: 7man7LMYT <67489949+7man7LMYT@users.noreply.github.com> Date: Wed, 20 Jul 2022 14:12:45 -0700 Subject: [PATCH 045/118] Update versions.json to include 1.19.10 (#59) * 1.19.0 -> 1.19.10 --- _data/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/versions.json b/_data/versions.json index c472398..92da2e8 100644 --- a/_data/versions.json +++ b/_data/versions.json @@ -1,4 +1,4 @@ { - "bedrock": "1.19.0", + "bedrock": "1.19.0 - 1.19.10", "java": "1.19" } From 7b0a7bac8a0a4040ecde47b01ac614d3ae634567 Mon Sep 17 00:00:00 2001 From: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Mon, 1 Aug 2022 00:37:02 -0400 Subject: [PATCH 046/118] Update wording on `saved-user-logins` --- _docs/geyser/understanding-the-config.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_docs/geyser/understanding-the-config.md b/_docs/geyser/understanding-the-config.md index 5342713..4fd4416 100644 --- a/_docs/geyser/understanding-the-config.md +++ b/_docs/geyser/understanding-the-config.md @@ -50,7 +50,7 @@ Stores a list of Bedrock players that should have their Java Edition account sav This saves a token that can be reused to authenticate the player later. This does not save emails or passwords, but you should still be cautious when adding to this list and giving others access to this Geyser instance's files. Removing a name from this list will delete its cached login information on the next Geyser startup. -The file for this is in the same folder as this config, named `saved-refresh-tokens.json`. +The file that tokens will be saved in is in the same folder as this config, named `saved-refresh-tokens.json`. Format: From 8656a6a4af05e9b37c1ad4b3baf48f730a3f09b0 Mon Sep 17 00:00:00 2001 From: Hasan <52300558+hasankayra04@users.noreply.github.com> Date: Wed, 3 Aug 2022 03:48:58 +0300 Subject: [PATCH 047/118] Removed lac from anticheat-compatibility.md (#72) * Update anticheat-compatibility.md * Removed lac from anticheat-compatibility.md Light Anti Cheat got removed from the list since it doesn't exist anymore. --- _docs/geyser/anticheat-compatibility.md | 1 - 1 file changed, 1 deletion(-) diff --git a/_docs/geyser/anticheat-compatibility.md b/_docs/geyser/anticheat-compatibility.md index e94f13c..4632430 100644 --- a/_docs/geyser/anticheat-compatibility.md +++ b/_docs/geyser/anticheat-compatibility.md @@ -12,7 +12,6 @@ Full Compatibility (Checks Bedrock Players Accurately) - [AntiAura](https://www.spigotmc.org/resources/1368/){:target="_blank"} (Paid) - Last Updated on 19th August 2021 - [Themis](https://www.spigotmc.org/resources/90766/){:target="_blank"} - Last Updated on 15th Jun 2022 -- [LightAntiCheat](https://www.spigotmc.org/resources/96341/){:target="_blank"} - Last Updated on 4th December 2021 - [Negativity V2](https://www.spigotmc.org/resources/86874/){:target="_blank"} (Paid) - Last Updated on 21st March 2022 - [SoaromaSAC](https://www.spigotmc.org/resources/87702/){:target="_blank"} - Last Updated on 27th March 2022 From 348eb2a057ebb4fc54b597c41ea7fca9824a66f0 Mon Sep 17 00:00:00 2001 From: Jackson_57 <49173011+jackson-57@users.noreply.github.com> Date: Tue, 2 Aug 2022 23:54:26 -0700 Subject: [PATCH 048/118] Add Standalone vs Plugin entry (#71) * Add Standalone vs Plugin entry * Update with review suggestions Co-authored-by: Olivia * Standalone benefits for large server networks (thanks @toinouH!) Co-authored-by: Olivia --- _docs/geyser/faq.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/_docs/geyser/faq.md b/_docs/geyser/faq.md index 39ec04d..0a35e6d 100644 --- a/_docs/geyser/faq.md +++ b/_docs/geyser/faq.md @@ -47,6 +47,9 @@ This is a non-complete list of what platform each plugin version of Geyser is fo * Geyser-Velocity works with [Velocity](https://www.velocitypowered.com/) * Geyser-Sponge works with [SpongeVanilla or SpongeForge](https://www.spongepowered.org/) +## Which type of Geyser version is better, standalone or plugin? +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. + ## What server versions does Geyser-Spigot support? The Geyser-Spigot plugin supports any Minecraft server version 1.12.2 or later. Any earlier version is not supported by the plugin - use a proxy version or the standalone build instead. From 910d4c25f55d4451dbce9ab2f89960552bc3a49c Mon Sep 17 00:00:00 2001 From: Jackelele Date: Fri, 5 Aug 2022 20:28:33 +0100 Subject: [PATCH 049/118] Update Server.pro in providers.json (#74) --- _data/providers.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/providers.json b/_data/providers.json index 9b1ba71..8ff407b 100644 --- a/_data/providers.json +++ b/_data/providers.json @@ -367,7 +367,7 @@ { "name": "Server.pro", "url": "https://server.pro", - "description": "**Update as of December 21, 2021 - a VPS plan is recommended by server.pro; other plans will not work or be very unreliable. Geyser can't do anything about this. The following instructions are untouched from before this update**. Get Geyser as a plugin. If you are using a Premium or Free plan, use the same port as your Java server for the Bedrock port in the configuration file and connect with that same port; for the Free plan, also enable the `clone-remote-port` option; leave the IP values as default (`0.0.0.0` and `auto`). If you are using a Pro or VPS plan, you can use any port you'd like and it's recommended to leave it to the default or `19132`." + "description": "Get Geyser as a plugin. If you are using a Premium or Free plan, use the same port as your Java server for the Bedrock port in the configuration file and connect with the same port; for the Free plan, also enable the `clone-remote-port` option; leave the IP values as default (`0.0.0.0` and `auto`). VPS plan is recommended. However, if you are using a PRO or a VPS plan, you can use any port you'd like, which can be opened on the Firewall tab. " }, { "name": "Shockbyte", From f2ffab5ae7aaa8599a7be049cb88d8479dc3fac3 Mon Sep 17 00:00:00 2001 From: Jens Collaert <63231928+Jens-Co@users.noreply.github.com> Date: Tue, 9 Aug 2022 16:09:27 +0200 Subject: [PATCH 050/118] Update provider list. (#76) --- _data/providers.json | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/_data/providers.json b/_data/providers.json index 8ff407b..42a4911 100644 --- a/_data/providers.json +++ b/_data/providers.json @@ -8,11 +8,6 @@ "url": "https://aternos.org/", "description": "Select as a plugin in the Aternos plugin list and connect to your server with your Java IP and port. See [Aternos's article](https://support.aternos.org/hc/en-us/articles/360051047631) for more details." }, - { - "name": "Arry Hosting", - "url": "https://arry.host/", - "description": "After logging into the panel, click the control button on the right side of the server you'd like to add Geyser to. Then select Egg Changer on the top of the screen. Scroll down to the bottom and click on change egg under the Geyser logo. Check off reinstall server. (This will install Paper and Geyser. You can change out the server software with anything else that works with Bukkit Plugins.)" - }, { "name": "Apex Hosting", "url": "https://apexminecrafthosting.com/", @@ -73,11 +68,6 @@ "url": "https://pufferfish.host/", "description": "Geyser is installed and configured on all servers by default." }, - { - "name": "SoulNode", - "url": "https://soulnode.net/", - "description": "Select [Plugin Pack](https://i.imgur.com/7e2QEKV.png) at checkout to auto-install Geyser. No extra setup required. Will auto bind to your default port to connect." - }, { "name": "SRKHOST", "url": "https://www.srkhost.eu/", @@ -141,11 +131,6 @@ "url": "https://craft-hosting.ru/", "description": "Get Geyser as a plugin. Use the same port as your Java server for the Bedrock port in your config and connect with that port; note that this provider appears to only provide service in Russia." }, - { - "name": "Dashflo.net", - "url": "https://dashflo.net/", - "description": "Get Geyser as a plugin. Use the same port as your Java server for the Bedrock port in your config and connect with that port, or buy a dedicated IP address to support a different port." - }, { "name": "DedicatedMC", "url": "https://dedicatedmc.io/", @@ -243,11 +228,6 @@ "url": "https://humbleservers.com/", "description": "Get Geyser as a plugin. Use the same port as your Java server for the Bedrock port in your config, or one of the two extra ports, and connect with that port. If the subdomain doesn't work, use your regular IP address with numbers." }, - { - "name": "Hexit", - "url": "https://client.hexit.cc/", - "description_template": "default" - }, { "name": "MC-HOST24.de", "url": "https://mc-host24.de/", @@ -290,7 +270,7 @@ }, { "name": "NightNodes", - "url": "https://nightnodes.host/", + "url": "https://nightnodes.com/", "description_template": "default" }, { @@ -319,11 +299,6 @@ "description_template": "default", "description": "See [this video](https://youtu.be/v9lC80UBZF4) for a PebbleHost-specific tutorial." }, - { - "name": "PhoenixNodes", - "url": "https://phoenixnodes.com", - "description": "Get Geyser as a plugin. Open a ticket to request an additional port for Geyser." - }, { "name": "PlanetNode", "url": "https://planetnode.net", @@ -344,11 +319,6 @@ "url": "https://redlinehosting.net/", "description_template": "default" }, - { - "name": "ReviveHost", - "url": "https://revivehost.com", - "description": "Get Geyser as a plugin. Request an additional port and put that port in your config.yml for the Bedrock server." - }, { "name": "Revivenode", "url": "https://revivenode.com/", From 8f1f88aed0726bc4f684a7a5276b0f6263b4e1ad Mon Sep 17 00:00:00 2001 From: Julianh Date: Tue, 9 Aug 2022 16:09:49 +0200 Subject: [PATCH 051/118] Add new host Eendhosting.nl (#75) --- _data/providers.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/_data/providers.json b/_data/providers.json index 42a4911..3aeeac6 100644 --- a/_data/providers.json +++ b/_data/providers.json @@ -136,6 +136,11 @@ "url": "https://dedicatedmc.io/", "description": "Get Geyser as a plugin. Need to ask to open the default bedrock port." }, + { + "name": "Eendhosting", + "url": "https://eendhosting.nl/", + "description_template": "default" + }, { "name": "EnviroMC", "url": "https://enviromc.host/", From 90187aa1f8b9492facfe118c1193405c71fc4d6d Mon Sep 17 00:00:00 2001 From: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Wed, 10 Aug 2022 10:26:28 -0400 Subject: [PATCH 052/118] Add documentation for enforce-secure-profile --- _docs/geyser/common-issues.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/_docs/geyser/common-issues.md b/_docs/geyser/common-issues.md index 1dbb555..f01d0da 100644 --- a/_docs/geyser/common-issues.md +++ b/_docs/geyser/common-issues.md @@ -72,6 +72,20 @@ If you're updating from an old build of Geyser, set your remote address to `auto ### Floodgate Misconfiguration See [this page](/floodgate/issues/) for more information. +### Missing profile key. This server requires secure profiles. + +*Vanilla, Spigot/Paper/forks, Fabric* + +Set `enforce-secure-profile: false` in [server.properties](https://minecraft.fandom.com/wiki/Server.properties) + +*BungeeCord and forks* + +Set `enforce_secure_profile: false` in [config.yml](https://www.spigotmc.org/wiki/bungeecord-configuration-guide/) + +*Velocity* + +Set `force-key-authentication = false` in [velocity.toml](https://github.com/PaperMC/Velocity/blob/dev/3.0.0/proxy/src/main/resources/default-velocity.toml#L19) + ### Mojang Resetting Account Credentials This is unfortunately something we have no control over, and is most likely the case when you're running Geyser as a plugin on a server host or joining a friend far away from your location. If you're running Geyser locally, this should not happen to you, but what we recommend for servers is a plugin we make called [Floodgate](https://github.com/GeyserMC/Floodgate), which allows for Bedrock clients to join your server without needing a Java Edition account. Take a look [here](Floodgate) for more information. From 1b8da699666799925a8303445528d630815d4ffb Mon Sep 17 00:00:00 2001 From: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Thu, 11 Aug 2022 13:03:52 -0400 Subject: [PATCH 053/118] Update Java and Bedrock supported versions --- _data/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_data/versions.json b/_data/versions.json index 92da2e8..8c1d348 100644 --- a/_data/versions.json +++ b/_data/versions.json @@ -1,4 +1,4 @@ { - "bedrock": "1.19.0 - 1.19.10", - "java": "1.19" + "bedrock": "1.19.0 - 1.19.20", + "java": "1.19.1/1.19.2" } From 3f309e9035ed741e3542715db1aa64f591f662c5 Mon Sep 17 00:00:00 2001 From: Tim203 Date: Sun, 14 Aug 2022 01:42:04 +0200 Subject: [PATCH 054/118] Use the new result handlers instead of the deprecated response handlers --- _docs/floodgate/forms.md | 84 +++++++--------------------------------- 1 file changed, 15 insertions(+), 69 deletions(-) diff --git a/_docs/floodgate/forms.md b/_docs/floodgate/forms.md index a17ed7c..4e4895b 100644 --- a/_docs/floodgate/forms.md +++ b/_docs/floodgate/forms.md @@ -7,8 +7,8 @@ permalink: /floodgate/forms/ # What is Cumulus? Bedrock Edition has a cool exclusive feature called Forms.
-Cumulus is the new Forms API that we use in Geyser and Floodgate. The source code is available [here](/floodgate/forms/). -You can access the Cumulus API through the [Floodgate API](/floodgate/api/). +Cumulus is the Forms API that we use in Geyser and Floodgate.
+The source code is available [here](/floodgate/forms/). You can access the Cumulus API through the [Floodgate API](/floodgate/api/). Bedrock knows three types of Forms: * ModalForm @@ -72,31 +72,6 @@ CustomForm.builder() .slider("Text", 0, 10, 1, 5) ``` -## Components - -Forms have different component types, most of them are limited to the CustomForm and some are available to everything but CustomForm. - -### Button -Limited to ModalForm and SimpleForm. With SimpleForm, buttons can have image icons and there can be more than 2. - -### Dropdown -Limited to CustomForm - -### Input -Limited to CustomForm. - -### Label -Limited to CustomForm. - -### Slider -Limited to CustomForm. - -### Stepslider -Limited to CustomForm. - -### Toggle -Limited to CustomForm. - ## Sending a form After you decided which form type you want to use and finished filling in the actual content, it's time to send the Form to the Bedrock player.
@@ -114,7 +89,7 @@ So you can make and send forms in a pretty compact way by doing something like t FloodgatePlayer player = FloodgateApi.getInstance().getPlayer(uuid); ... player.sendForm( - new CustomForm.Builder() + CustomForm.builder() .title("My cool title") .content("10/10 content") )); @@ -122,46 +97,17 @@ player.sendForm( ## Receiving a response from the client -It's nice and all that we can send forms to a client, but we also want to be able to get a response from a client and being able to handle them. -We can do that using the `responseHandler(BiConsumer)` method in the FormBuilder: +It's nice and all that we can send forms to a client, but we also want to be able to get a response from a client and being able to handle them.
+We can do that using one (or multiple) result handers. The most used result handlers are: `validResultHandler(BiConsumer | Consumer)`, `invalidResultHandler`, `closedResultHandler` and `closedOrInvalidResultHandler`.
+Here follows an example that uses result handlers: ```java -_Modal_Form.builder() - .title("Feedback form") - .content("We're asking for feedback, are you willing to enter some feedback to improve our server?") - .button1("Yes") // id = 0 - .button2("No") // id = 1 - .responseHandler((form, responseData) -> { - _Modal_FormResponse response = form.parseResponse(responseData); - if (!response.isCorrect()) { - // player closed the form or returned invalid info (see FormResponse) - return; - } - - // short version of getClickedButtonId == 0 - if (response.getResult()) { - System.out.println("Yay, he wants to give us feedback"); - return; - } - System.out.println("No feedback for us :("); - }); -``` -Or using the response handler setter of the Form (not a FormBuilder): -```java -_Modal_Form form = ...; -form.setResponseHandler(responseData -> { - _Modal_FormResponse response = form.parseResponse(responseData); - if (!response.isCorrect()) { - // player closed the form or returned invalid info (see FormResponse) - return; - } - - // short version of getClickedButtonId == 0 - if (response.getResult()) { - System.out.println("Yay, he wants to give us feedback"); - return; - } - System.out.println("No feedback for us :("); -}); +CustomForm.builder() + .title("geyser.auth.login.form.details.title") + .label("geyser.auth.login.form.details.desc") + .input("geyser.auth.login.form.details.email", "account@geysermc.org", "") + .input("geyser.auth.login.form.details.pass", "123456", "") + .closedOrInvalidResultHandler(() -> buildAndShowLoginDetailsWindow(session)) + .validResultHandler(response -> session.authenticate(response.next(), response.next()))); ``` ## Advanced stuff @@ -169,7 +115,7 @@ form.setResponseHandler(responseData -> { The FormBuilder also has support for translating the data used in the builder.
To add a translator, you can use the `translator(BiFunction)` or the `translator(BiFunction, String)` method: ```java -_Modal_Form form = _Modal_Form.builder() +ModalForm form = ModalForm.builder() .translator(this::translate, userLanguage) .title("Title") .content("Content") @@ -186,7 +132,7 @@ public String translate(String key, String locale) { ``` Or you can have the translate method directly in the FormBuilder instead of a separate method: ```java -_Modal_Form form = _Modal_Form.builder() +ModalForm form = ModalForm.builder() .translator((key, unused) -> { // this method will be called for every string, in this case, 4 times: // Title, Content, translate.button1, translate.button2 From e681a3f8aa999a6415a2be1917a67435789238f6 Mon Sep 17 00:00:00 2001 From: Jackelele Date: Sat, 20 Aug 2022 19:47:44 +0100 Subject: [PATCH 055/118] Update providers.json (#78) * Update providers.json * Update providers.json --- _data/providers.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/_data/providers.json b/_data/providers.json index 3aeeac6..15ffabd 100644 --- a/_data/providers.json +++ b/_data/providers.json @@ -68,6 +68,11 @@ "url": "https://pufferfish.host/", "description": "Geyser is installed and configured on all servers by default." }, + { + "name": "Server.pro", + "url": "https://server.pro", + "description": "On VPS, select Geyser in the [Service Type Menu](https://i.imgur.com/loSNmvu.png), Floodgate can be enabled and disabled on the dashboard configuration. For manual installation: If using a Premium or Free plan, use the same port as your Java server for the Bedrock port in the configuration file and connect with the same port; for the Free plan, also enable the `clone-remote-port` option; leave the IP values as default (`0.0.0.0` and `auto`). However, if you are using a PRO or a VPS plan, you can use any port you'd like, which can be opened on the Firewall tab." + }, { "name": "SRKHOST", "url": "https://www.srkhost.eu/", @@ -339,11 +344,6 @@ "url": "https://scalacube.com/", "description": "Get Geyser as a plugin. Use the same address and port as your Java server for the Bedrock address and port in your config and connect with that port." }, - { - "name": "Server.pro", - "url": "https://server.pro", - "description": "Get Geyser as a plugin. If you are using a Premium or Free plan, use the same port as your Java server for the Bedrock port in the configuration file and connect with the same port; for the Free plan, also enable the `clone-remote-port` option; leave the IP values as default (`0.0.0.0` and `auto`). VPS plan is recommended. However, if you are using a PRO or a VPS plan, you can use any port you'd like, which can be opened on the Firewall tab. " - }, { "name": "Shockbyte", "url": "https://shockbyte.com/", From 5c02623aa50789b7e84e9d1cf015dccdc2bf5503 Mon Sep 17 00:00:00 2001 From: Jackson_57 <49173011+jackson-57@users.noreply.github.com> Date: Tue, 23 Aug 2022 10:32:43 -0700 Subject: [PATCH 056/118] Bump Bedrock version (#79) --- _data/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/versions.json b/_data/versions.json index 8c1d348..c31cb97 100644 --- a/_data/versions.json +++ b/_data/versions.json @@ -1,4 +1,4 @@ { - "bedrock": "1.19.0 - 1.19.20", + "bedrock": "1.19.0 - 1.19.21", "java": "1.19.1/1.19.2" } From 2aaa1142181770470d45f392412313560d41f848 Mon Sep 17 00:00:00 2001 From: Jens Collaert <63231928+Jens-Co@users.noreply.github.com> Date: Tue, 30 Aug 2022 20:18:58 +0200 Subject: [PATCH 057/118] edit link titles (#83) --- _includes/editable.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/editable.html b/_includes/editable.html index 92e81a0..7a71523 100644 --- a/_includes/editable.html +++ b/_includes/editable.html @@ -1,6 +1,6 @@ Edit this page - Create documentation issue - Create project issue + Create Wiki issue/bug report + Create Geyser issue/bug report From e8716f113a05ff0071757d8eaca5ba15450b671f Mon Sep 17 00:00:00 2001 From: Botings <85144646+Botings@users.noreply.github.com> Date: Tue, 30 Aug 2022 11:22:31 -0700 Subject: [PATCH 058/118] Update anticheat-compatibility.md (#68) --- _docs/geyser/anticheat-compatibility.md | 1 + 1 file changed, 1 insertion(+) diff --git a/_docs/geyser/anticheat-compatibility.md b/_docs/geyser/anticheat-compatibility.md index 4632430..0a869e8 100644 --- a/_docs/geyser/anticheat-compatibility.md +++ b/_docs/geyser/anticheat-compatibility.md @@ -23,6 +23,7 @@ Partially Compatible (Does not Check/Ignores Bedrock Players) - [Matrix](https://matrix.rip/){:target="_blank"} (Paid) - Last updated on 2nd September 2021 - [Spartan](https://www.spigotmc.org/resources/25638/){:target="_blank"} (Spartan Syn offers full Bedrock checks for an additional $43) (Paid) - Last Updated on 19th August 2021 - [Vulcan](https://www.spigotmc.org/resources/83626/){:target="_blank"} (Paid) - Last Updated on 19th August 2021 +- [Verus](https://verus.ac){:target="_blank"} (Paid) - Last Updated on 13th July 2022 Incompatible (False Positives on Bedrock Players, no Compatibility at All) From b0eb22bbaa612bbf44a7a6d876dc17a5f892ceb5 Mon Sep 17 00:00:00 2001 From: ImDaBigBoss <67973871+ImDaBigBoss@users.noreply.github.com> Date: Mon, 19 Sep 2022 18:44:58 +0200 Subject: [PATCH 059/118] Added custom item documentation (#43) --- _data/toc.yml | 9 +++ _docs/geyser/custom-items.md | 150 +++++++++++++++++++++++++++++++++++ 2 files changed, 159 insertions(+) create mode 100644 _docs/geyser/custom-items.md diff --git a/_data/toc.yml b/_data/toc.yml index 8f42672..6706c17 100644 --- a/_data/toc.yml +++ b/_data/toc.yml @@ -41,6 +41,15 @@ url: "geyser/current-limitations/" - title: Using playit.gg with Geyser url: "geyser/playit-gg/" + - title: Custom items with Geyser + url: "geyser/custom-items/" + children: + - title: JSON mappings + url: "geyser/custom-items/#json-mappings" + - title: Geyser extensions + url: "geyser/custom-items/#geyser-extensions" + - title: Resource pack + url: "geyser/custom-items/#resource-pack" - title: Floodgate Documentation url: "floodgate/" links: diff --git a/_docs/geyser/custom-items.md b/_docs/geyser/custom-items.md new file mode 100644 index 0000000..60e74e0 --- /dev/null +++ b/_docs/geyser/custom-items.md @@ -0,0 +1,150 @@ +--- +layout: page +title: Custom items with Geyser +permalink: /geyser/custom-items/ +--- + +# Custom items with Geyser + +To setup custom items in geyser, you have to choose how you are going to register your items. The easiest is [using a json file](#json-mappings) but you can also [use a Geyser extension](#geyser-extensions). + +## JSON mappings + +1. Start your server, and you should have a folder called `custom_mappings` that is created. That would be with the folder of `Geyser.jar` file for standalone and inside your Geyser data folder for a plugin. +2. Create a `.json` file, it can be any name you like and as many files as you like. You don't need to make one file per item. Here is the structure of the file: +```json +{ + "format_version": 1, + "items": { + + } +} +``` +3. Inside the `items` entry, you can add your java item to extend: +```json +"minecraft:JAVA_ITEM": [ + +] +``` +4. Inside this java item, goes an array of all your custom items. +```json +{ + "name": "my_item" +} +``` +5. Then, you need to set one or more item options or registrations, they can be stacked, so that all of the specified types need to match. + * Custom model data: `custom_model_data` (int) + * Damage predicate: `damage_predicate` (int) This is a fractional value of damage/max damage and not a number between 0 and 1. + * Unbreakable: `unbreakable` (boolean) +6. You also have some extra modifiers that you can set to further customise your item. **Note that the following modifiers are NOT required.** + * `display_name` (string) default: item name + * `icon` (string) default: item name + * `allow_offhand` (boolean) default: false + * `texture_size` (int) default: 16 + * `render_offsets` (object) It works as follows. Note that all the sub-objects are optional, except x, y and z. You can have for example only a main hand with a position, and noting else. default: no render offset + ```json + "render_offsets": { + "main_hand": { + "first_person": { + "position": { + "x": 0, + "y": 0, + "z": 0 + }, + "rotation": { + "x": 0, + "y": 0, + "z": 0 + }, + "scale": { + "x": 0, + "y": 0, + "z": 0 + } + }, + "third_person": { + + } + }, + "off_hand": { + + } + } + ``` + +## Geyser extensions + +### Extending a vanilla item + +1. Create your custom item options or registrations, to which you can add any of the following. They can be stacked, so that all of the specified types need to match, but you **do NOT need all of them.** +```java +CustomItemOptions itemOptions = CustomItemOptions.builder() + .customModelData(1) + .damagePredicate(1) //This is a fractional value of damage/max damage and not a number between 0 and 1. + .unbreakable(true) + .build(); +``` +2. Create your custom item, and store it somewhere: +```java +CustomItemData data = CustomItemData.builder() + .name("my_item") + .customItemOptions(itemOptions) + .build(); +``` +3. You have some modifiers that you can set to further customise your item. **Note that the following modifiers are NOT required.** +```java +.displayName("displayName"); //Default: item name +.icon("my_icon"); //Default: item name +.allowOffhand(false); //Default: false +.textureSize(16); //Default: 16 +.renderOffsets(new CustomRenderOffsets(...)); //Default: no render offset +``` +4. Then, in your pre init event, you can register your item: +```java +@Subscribe +public void onGeyserPreInitializeEvent(GeyserDefineCustomItemsEvent event) { + event.registerCustomItem("minecraft:JAVA_ITEM", data); +} +``` + +### Non vanilla (modded) items with Geyser extensions (for example to use with Fabric) + +1. Create your item data: +```java +NonVanillaCustomItemData data = NonVanillaCustomItemData.builder() + .name("my_item") + .identifier("my_mod:my_item") + .javaId(1) +``` +2. There are many other options you can set to match the behavior that you require for your item. You can see them [here](https://github.com/GeyserMC/Geyser/blob/master/api/geyser/src/main/java/org/geysermc/geyser/api/item/custom/NonVanillaCustomItemData.java) +3. Register your item in the pre init event: +```java +@Subscribe +public void onGeyserPreInitializeEvent(GeyserDefineCustomItemsEvent event) { + event.registerCustomItem(data); +} +``` + +## Resource pack + +1. Setup a basic bedrock resource pack. If you need help, you can find it [here](https://wiki.bedrock.dev/guide/project-setup.html#rp-manifest). +2. Make a `textures` folder. +3. Create `item_texture.json` in the `textures`, and put this in it: +```json +{ + "resource_pack_name": "MY_PACK_NAME_HERE", + "texture_name": "atlas.items", + "texture_data": { + + } +} +``` +4. Inside texture data, you can add your items. The texture name and path must match the name that you set in your mappings. +```json +"my_item": { + "textures": [ + "textures/items/my_item" + ] +} +``` +5. Then you need to put your textures inside the `textures/items`. Make sure to have it match the texture path that you specified in `item_texture.json`! \ No newline at end of file From 6f493d7759fb2f6da1ef68e8303c67fd92e35c53 Mon Sep 17 00:00:00 2001 From: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Mon, 19 Sep 2022 13:16:32 -0400 Subject: [PATCH 060/118] Fix JSON formatting --- _docs/geyser/custom-items.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/_docs/geyser/custom-items.md b/_docs/geyser/custom-items.md index 60e74e0..3bd4158 100644 --- a/_docs/geyser/custom-items.md +++ b/_docs/geyser/custom-items.md @@ -21,12 +21,14 @@ To setup custom items in geyser, you have to choose how you are going to registe } ``` 3. Inside the `items` entry, you can add your java item to extend: + ```json "minecraft:JAVA_ITEM": [ ] ``` 4. Inside this java item, goes an array of all your custom items. + ```json { "name": "my_item" @@ -130,6 +132,7 @@ public void onGeyserPreInitializeEvent(GeyserDefineCustomItemsEvent event) { 1. Setup a basic bedrock resource pack. If you need help, you can find it [here](https://wiki.bedrock.dev/guide/project-setup.html#rp-manifest). 2. Make a `textures` folder. 3. Create `item_texture.json` in the `textures`, and put this in it: + ```json { "resource_pack_name": "MY_PACK_NAME_HERE", @@ -140,6 +143,7 @@ public void onGeyserPreInitializeEvent(GeyserDefineCustomItemsEvent event) { } ``` 4. Inside texture data, you can add your items. The texture name and path must match the name that you set in your mappings. + ```json "my_item": { "textures": [ @@ -147,4 +151,4 @@ public void onGeyserPreInitializeEvent(GeyserDefineCustomItemsEvent event) { ] } ``` -5. Then you need to put your textures inside the `textures/items`. Make sure to have it match the texture path that you specified in `item_texture.json`! \ No newline at end of file +5. Then you need to put your textures inside the `textures/items`. Make sure to have it match the texture path that you specified in `item_texture.json`! From 16184001d564c3e95d248418c04a91e1c772c5c1 Mon Sep 17 00:00:00 2001 From: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Wed, 21 Sep 2022 15:38:53 -0400 Subject: [PATCH 061/118] 1.19.30 is supported --- _data/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/versions.json b/_data/versions.json index c31cb97..2640e87 100644 --- a/_data/versions.json +++ b/_data/versions.json @@ -1,4 +1,4 @@ { - "bedrock": "1.19.0 - 1.19.21", + "bedrock": "1.19.0 - 1.19.30", "java": "1.19.1/1.19.2" } From 9536cef2dffbf840fef8eb124d7a6ff2d6388f98 Mon Sep 17 00:00:00 2001 From: Tim203 Date: Sun, 2 Oct 2022 11:06:29 +0200 Subject: [PATCH 062/118] The latest version of the Floodgate API is 2.2.0-SNAPSHOT --- _docs/floodgate/api.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_docs/floodgate/api.md b/_docs/floodgate/api.md index 8019457..c8493ab 100644 --- a/_docs/floodgate/api.md +++ b/_docs/floodgate/api.md @@ -21,7 +21,7 @@ Floodgate uses the open collaboration repo. The following example is for Maven, org.geysermc.floodgate api - 2.0-SNAPSHOT + 2.2.0-SNAPSHOT provided ``` From c895e3ab426d32a84d6a99272b1ef008b7f599b4 Mon Sep 17 00:00:00 2001 From: Ahmed A <95593064+AhmedA1559@users.noreply.github.com> Date: Mon, 3 Oct 2022 21:52:21 -0500 Subject: [PATCH 063/118] Add an alternative Android app for connecting (#84) --- _docs/geyser/using-geyser-with-consoles.md | 1 + 1 file changed, 1 insertion(+) diff --git a/_docs/geyser/using-geyser-with-consoles.md b/_docs/geyser/using-geyser-with-consoles.md index 8f18cce..e27b679 100644 --- a/_docs/geyser/using-geyser-with-consoles.md +++ b/_docs/geyser/using-geyser-with-consoles.md @@ -48,6 +48,7 @@ If you have an Android device, you have several options: - [MC Lan Proxy (Trial)](https://play.google.com/store/apps/details?id=com.luzenna.mineproxydroidtrial) - [MC Lan Proxy (Paid)](https://play.google.com/store/apps/details?id=com.luzenna.mineproxydroid) - [MC Server Connector](https://play.google.com/store/apps/details?id=com.smokiem.mcserverconnector) +- [Tempest](https://play.google.com/store/apps/details?id=net.ahmed.tempest) ### Using an iOS device If you have an iOS 14+ device, you can use [BedrockTogether](https://apps.apple.com/app/bedrocktogether/id1534593376). From cb52ea3bafaa287615076c3aac46878ff6df84e8 Mon Sep 17 00:00:00 2001 From: onebeastchris <105284508+onebeastchris@users.noreply.github.com> Date: Tue, 4 Oct 2022 07:41:08 +0200 Subject: [PATCH 064/118] Wiki Setup page changes (#86) * the setup guide is more complete now * split standalone instructions for cleaner look * mention floodgate * pterodactyl port forward * fix typo * remove unnecessary if statement * removed and from list * removed and from list * fix update links/names for standalone * fixes after review * add chat signing info * let auto stay auto * fix further capitalisation * add warning to disabling the chat signing requirement * Add more info link * 1.13 as the lowest supported version * 1.12.2 -> 1.13.2 Updated version number to the correct version. Unless any other changes are requested, i don't plan on adding further on this PR * standalone permalink fix * Update _docs/geyser/setup.md Co-authored-by: Jackson_57 <49173011+jackson-57@users.noreply.github.com> * Update _docs/geyser/setup.md Co-authored-by: Jackson_57 <49173011+jackson-57@users.noreply.github.com> * Update _docs/geyser/setup.md Co-authored-by: Jackson_57 <49173011+jackson-57@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Jackson_57 <49173011+jackson-57@users.noreply.github.com> * Remove recommendation to run Geyser as root on iOS * Changed toc.yml to (hopefully) include the new "standalone" page, and moved its children pages Co-authored-by: Jackson_57 <49173011+jackson-57@users.noreply.github.com> --- _data/toc.yml | 9 +-- _docs/geyser/faq.md | 2 +- _docs/geyser/setup.md | 116 +++++++++++++++++-------------------- _docs/geyser/standalone.md | 75 ++++++++++++++++++++++++ 4 files changed, 133 insertions(+), 69 deletions(-) create mode 100644 _docs/geyser/standalone.md diff --git a/_data/toc.yml b/_data/toc.yml index 6706c17..50d8d53 100644 --- a/_data/toc.yml +++ b/_data/toc.yml @@ -6,14 +6,15 @@ children: - title: Plugin Setup url: "geyser/setup/#plugin-setup" - - title: Standalone Setup - url: "geyser/setup/#standalone-setup" + - title: Videos + url: "geyser/setup/#setup-videos" + - title: "Standalone" + url: "geyser/standalone/" + children: - title: Termux (Android) url: "geyser/setup/#termux-android" - title: NewTerm 2 (iOS) url: "geyser/setup/#newterm-2-ios" - - title: Videos - url: "geyser/setup/#setup-videos" - title: FAQ url: "geyser/faq/" - title: Common Issues diff --git a/_docs/geyser/faq.md b/_docs/geyser/faq.md index 0a35e6d..9902f31 100644 --- a/_docs/geyser/faq.md +++ b/_docs/geyser/faq.md @@ -94,7 +94,7 @@ This is a Bedrock client issue caused by Bedrock being 32-bit and Java being 64- No, this is a translation tool to allow Bedrock players to connect to Java servers. It does not work the opposite way. ## Can I use Geyser with Pterodactyl Panel? -Yes, you can use Geyser as a plugin or a mod for your Minecraft server software running on Pterodactyl. There is also an official egg for the standalone version. It supports auto-updating and has all config options easily editable. You can find it [here](https://github.com/GeyserMC/pterodactyl-stuff), download the JSON egg, and import it into your panel. +Yes, you can use Geyser as a plugin or a mod for your Minecraft server software running on Pterodactyl. There is also an official egg for the standalone version. It supports auto-updating and has all config options easily editable. You can find it [here](https://github.com/GeyserMC/pterodactyl-stuff), download the JSON egg, and import it into your panel. Make sure the Geyser port (using UDP) is exported out to the host & allocated the port to the server. ## Can I use Geyser with Ngrok? Unfortunately, Ngrok is TCP-only, so you will not be able to use Geyser with Ngrok. As an alternative, you can use [playit.gg](https://playit.gg), which supports both TCP and UDP. diff --git a/_docs/geyser/setup.md b/_docs/geyser/setup.md index 29fdfe4..a154465 100644 --- a/_docs/geyser/setup.md +++ b/_docs/geyser/setup.md @@ -6,31 +6,52 @@ permalink: /geyser/setup/ # Setup -Bedrock clients will join through Geyser and it will handle all the packet translations. There are six different versions of Geyser: Geyser for Spigot (works on derivatives such as Paper), Geyser for BungeeCord (also works on Waterfall), Geyser for Velocity, Geyser for Sponge, Geyser for Fabric (does not support client required mods, and more info about that can be found [here](/other/geyser-fabric/)) and Geyser Standalone. The first five versions run as plugins/mods and can be installed directly onto the server. The standalone version can be used in a similar way, except you run it separately. +## Overview + +Bedrock clients will join through Geyser, and it will handle all the packet translations. There are six different versions of Geyser: +1. Geyser for Spigot (works on derivatives such as Paper), +2. Geyser for BungeeCord (also works on Waterfall), +3. Geyser for Velocity, +4. Geyser for Sponge, +5. Geyser for Fabric (does not support client required mods, and more info about that can be found [here](/other/geyser-fabric/)), +6. Geyser Standalone (Standalone Setup instructions are [here](/geyser/standalone/)). + +The first five versions run as plugins/mods and can be installed directly onto the server. The standalone version can be used in a similar way, except you run it separately. If you are running a server, it is highly recommended you use one of the plugin versions, and if you want to join a server that does not have Geyser installed, you can run the standalone version. If you use Pterodactyl Panel we have an egg for the standalone version, please see [here](/geyser/faq/#can-i-use-geyser-with-pterodactyl-panel) for more information. -If you're still having problems with Geyser not working or giving you an "Unable to connect to world" error, see the [Common Issues](/geyser/common-issues/) page.\ -For more information, take a look at the [Understanding the Config](/geyser/understanding-the-config/) page, and the [FAQ](/geyser/faq/) page.\ -And if you still have questions, feel free to join the [Discord](https://discord.geysermc.org) if you haven't already. ## Prerequisites - - The server you are connecting to has to support the latest version of Minecraft Java Edition (at this time this is Minecraft {{ site.data.versions.java }}) -The server itself does not have to be the latest version but does have to allow connections. If you're running the server on an older version, you can use the plugin [ViaVersion](https://www.spigotmc.org/resources/19254/), but do note that only **1.12.2 and any version above is officially supported**. +The server itself does not have to be the latest version but does have to allow connections. If you're running the server on an older version, you can use the plugin [ViaVersion](https://www.spigotmc.org/resources/19254/), but do note that only **1.13.2 and any version above is officially supported**. For older versions, use Geyser Standalone, or Geyser on a proxy like Velocity or BungeeCord. - The device running Geyser must support Java 16 or later. If you need help installing or updating, please see [PaperMC's Java update page](https://paper.readthedocs.io/en/latest/java-update/index.html). If you're running a version of Paper that does not support Java 16 or later, you can add the flag `-DPaper.ignoreJavaVersion=true` to your startup Java arguments to allow Paper to run on Java 16. You can run Geyser standalone on another device if a server software cannot be updated to use Java 16. - If you are connecting to an online mode Java server, a paid Java account is required. If you are running the server, you can bypass this requirement for your server with [Floodgate](/floodgate/). - Your Bedrock client has to be a supported version - at this time that is Bedrock version(s) {{ site.data.versions.bedrock }}. - If you are running the server, you need to have a UDP port opened. See below for more instructions. +- Currently, Geyser does not support key signing. To disable it (on servers running version 1.19 and higher), follow these instructions: Spigot, Paper, & all forks: Set `enfore-secure-profile: false` in the `server.properties` file. On BungeeCord: Set `enforce_secure_profile: false` in your `config.yml`. Using Velocity: set `force-key-authentication = false` in your `velocity.toml`. This will disable chat signing, which Geyser currently does not support. Be careful though: This will allow Java players who bypass chat signing with mods such as NoChatReports to join the server, and make them unreportable. For more info on chat reporting, see this [article](https://gist.github.com/kennytv/ed783dd244ca0321bbd882c347892874). ## Plugin Setup -1. Download a jar of Geyser from the [build server](https://ci.opencollab.dev/job/Geyser/job/master/) depending on what platform your server runs on. See the [FAQ](/geyser/faq/#which-plugin-version-of-geyser-do-i-need) if you're confused about which build to download. -2. Put the Geyser jar file in your plugins folder and start up the server. -3. If you are on a hosting provider, you will likely need to change your Bedrock port in `config.yml`. Information on your hosting provider might be available on the [Supported Hosting Providers](/geyser/supported-hosting-providers/) page. -4. Restart your server if you edited your config. -5. If not using a hosting provider you will need to use port forwarding to allow people out of your LAN to connect. You want to port forward 19132 UDP, instructions to do that for most routers can be found [here](https://www.lifewire.com/how-to-port-forward-4163829). +1. Read the Prerequisites above, especially if you are setting up Geyser for an older Minecraft Java Edition version! +2. To make sure you are using the easiest way to set up Geyser, please check whether your hosting provider features [built-in Geyser](/supported-hosting-providers/#built-in-geyser). If you are not using a hosting provider, or your hosting provider is not featured on said list, continue with the steps below. +3. If 2. does not apply: download a jar of Geyser from the [build server](https://ci.opencollab.dev/job/Geyser/job/master/) depending on what platform your server runs on. See the [FAQ](/geyser/faq/#which-plugin-version-of-geyser-do-i-need) if you're confused about which build to download. Keep in mind: Geyser-Spigot.jar is for Spigot and its forks, such as PaperMC or Purpur. +4. Put the Geyser jar file in your plugins folder and start up the server. +5. Port-forwarding: + - If you are using a hosting provider, you will likely need to change your Bedrock port in `config.yml`. Information on your hosting provider might be available on the [Supported Hosting Providers](/geyser/supported-hosting-providers/) page. If there is no information on your hosting provider and you are unable to assign/open ports yourself, try enabling `clone-remote-port` in Geyser's `config.yml`file and connecting with the same IP/port as you would with Java Edition. + - If not using a hosting provider, you will need to use port forwarding to allow people outside your LAN to connect. You want to port forward 19132 UDP, instructions to do that for most routers can be found [here](https://www.lifewire.com/how-to-port-forward-4163829). If you are trying to join from the same LAN, the server should show up in the friends tab. + - To check whether it is working correctly, you can use the `geyser connectiontest [yourIP]:[yourPort]` command in your server console to check if the server is reachable from the outside. + - _Restart your server if you edited your config! Simply reloading will not work._ +6. Besides the `port` entry in the _Bedrock Section_ of Geyser's `config.yml`, you rarely need to change anything. A few examples: + - `address: 0.0.0.0` The IP address that will listen for connections. There is no reason to change this unless you want to limit what IPs can connect to your server or if your hosting provider instructs you to do so. + - `port: 19132` The port Bedrock players will use to connect. If the option `clone-remote-port` is set to true, this port is ignored, and you'll have to use the same port on bedrock as you would on Java to connect. +7. The _remote_ section in the `config.yml` determines, which Java server the Bedrock players join. +- `address: auto` This means, that Geyser configures the server's IP, port and auth-type of the java server by itself, leave this at auto. +- `port: 25565` This should be the port of the Java server. By default, it is set to 25565 - your hosting provider may have assigned a different port to your Java server, set that here. +8. If you wish to remove the Java account requirement, set up the [Floodgate](/floodgate/setup/) plugin. This will allow Bedrock players to play on your server, without you having to use offline mode. +9. For further Geyser config changes, like allowing Bedrock players to build on the nether roof, refer to [the config help article](/geyser/understanding-the-config/). -If you are trying to join from the same LAN, the server should show up in the friends tab. +If you're still having problems with Geyser not working or giving you an "Unable to connect to world" error, see the [Common Issues](/geyser/common-issues/) page.\ +For more information, take a look at the [Understanding the Config](/geyser/understanding-the-config/) page, and the [FAQ](/geyser/faq/) page.\ +And if you still have questions, feel free to join the [Discord](https://discord.geysermc.org) if you haven't already. ### BungeeCord/Velocity Setup If you are using a BungeeCord, Waterfall, or Velocity proxy, then you only need to install Geyser (and Floodgate, if you desire) on the proxy. @@ -39,64 +60,31 @@ You can install Floodgate (but not Geyser) on the back-end servers to improve sk The Bedrock clients, like Java clients, should connect to the proxy server, and should never directly connect to a back-end server. You don't need to (and shouldn't) port-forward anything for the back-end servers! +#### Setup: +1. Make sure Velocity/BungeeCord is up-to-date. The proxy can be newer than the servers behind it (also called backend servers). If you're running the backend servers on an older version then the current {{ site.data.versions.java }}, you can use the plugin [ViaVersion](https://www.spigotmc.org/resources/19254/). It is recommended to have the plugin on all backend servers where necessary, instead to having it on the proxy. +2. Download a jar of Geyser from the [build server](https://ci.opencollab.dev/job/Geyser/job/master/) depending on what platform your server runs on. See the [FAQ](/geyser/faq/#which-plugin-version-of-geyser-do-i-need) if you're confused about which build to download. +3. Put the Geyser jar file in your plugins folder and start up the server. +4. Port-forwarding: +- If you are using a hosting provider, you will likely need to change your Bedrock port in the `config.yml` file. Information on your hosting provider might be available on the [Supported Hosting Providers](/geyser/supported-hosting-providers/) page. If your hosting provider is not listed there, and you are unable to port forward the default 19132 port on UDP, try setting `clone-remote-port` to true and connecting with the Java IP and port. Any port will work, as long as the UDP protocol is not blocked or already in use by the query feature (see `server.properties`) or another mod. +- If you are not using a hosting provider, you will need to use port forwarding to allow people out of your LAN to connect. You want to port forward 19132 UDP, instructions to do that for most routers can be found [here](https://www.lifewire.com/how-to-port-forward-4163829). Note: Any port will work, as long as UDP traffic is not blocked. Java uses the TCP protocol, so you will need to open both UDP and TCP if you wish to use the same port. +- To check whether it is working correctly, you can use the `geyser connectiontest [yourIP]:[yourPort]` command in your server console to check if the server is reachable from the outside. +- _Restart your server if you edited your config! Simply reloading will not work._ +5. Besides the `port` entry in the _Bedrock Section_ of Geyser's `config.yml`, you rarely need to change anything. A few examples: +- `address: 0.0.0.0` The IP address that will listen for connections. There is no reason to change this unless you want to limit what IPs can connect to your server or if your hosting provider instructs you to do so. +- `port: 19132` The port bedrock players will use to connect. If the option `clone-remote-port` is set to true, this port is ignored, and you'll have to use the same port on Bedrock as you would on Java to connect. +6. The _remote_ section in the `config.yml` determines which Java proxy the Bedrock players join. The proxy then configures which server the players are sent to. +- `address: auto` Leaving this at auto is recommended, because it means that Geyser configures the proxy's IP, port and auth-type itself. +- `port: 25565` This should be the port of the Java server. By default, it is set to 25565 - your hosting provider may have assigned a different port to your proxy, set that here. +7. For further Geyser config changes, like allowing Bedrock players to build on the nether roof, refer to [the config help article](/geyser/understanding-the-config/). + + ## Standalone Setup -Please keep in mind, you need some sort of computer or host to run Geyser Standalone on. Applications such as Termux on Android are capable of running Geyser, but this largely depends on how powerful your Android device is. Please do so at your own risk. Instructions to run Geyser on Termux can be found [here](/geyser/setup/#termux-android). - -1. Download a jar of Geyser from the [build server](https://ci.opencollab.dev/job/Geyser/job/master/). -2. Create a new folder for Geyser, and drop the jar in there. - -### GUI Setup (Recommended) -3. Double-click the jar file and all the necessary files for Geyser will be created. -4. Configure options such as the server you want to join in the Geyser config. A description of all options of the config can be found on the [Understanding the Config](/geyser/understanding-the-config/) page. -5. Stop the current instance of Geyser and re-run it. - -### Console Setup -3. Create a new bat or startup script, similar to the one you'd use for a Spigot or Paper server, and take a look at [this](/geyser/creating-a-startup-script/) page for what to put into it. -4. Run the startup script/bat, and all the necessary files for Geyser will be created. -5. Configure options such as the server you want to join in the Geyser config. A description of all options of the config can be found on the [Understanding the Config](/geyser/understanding-the-config/) page. -6. Stop the current instance of Geyser and re-run it. - -Once you're done, open up Minecraft: Bedrock Edition and in the **Friends** tab, Geyser should show up there. If it does not show up, just add the Java IPv4 address and Bedrock port. - -### Standalone Setup (Geyser and Floodgate are not on the same server) -If you want to offload Geyser's processing you can host Geyser (Standalone) somewhere else and make it redirect to your server. -**Warning:** Do not forget to edit the remote section of your Geyser config. -See the [Floodgate](/floodgate/) wiki page for more details. +Please read [Standalone Setup](/geyser/standalone/) to set up Geyser Standalone. ## Port Forwarding Unlike Minecraft Java Edition, Bedrock Edition runs on port 19132 on the UDP protocol. When port forwarding, make sure to allocate to 19132 UDP or another UDP port. For many server hosting providers, you will simply need to change your Bedrock listening port (see [here](/geyser/supported-hosting-providers/) for a list of supported providers). -## Termux (Android) -Please read the disclaimer [here](/geyser/setup/#standalone-setup) before continuing. -1. Download and install [Termux](https://termux.com/) -2. Run `pkg install openjdk-17` -3. Run `wget https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/master/lastSuccessfulBuild/artifact/bootstrap/standalone/target/Geyser.jar` -4. Run `java -jar Geyser.jar` - -OR - -We have an automated setup script for clean Termux installs, which might not work for all users. If the manual guide above does not work, try this. -Run this to start the download/install: -``` -curl https://gist.githubusercontent.com/rtm516/e3e07d6595ee41e05a38b03c0f4d7a80/raw/install.sh | bash -``` - -## NewTerm 2 (iOS) -**Note:** A jailbreak is required. You can find what jailbreak to use for your device [here](https://docs.google.com/spreadsheets/d/11DABHIIqwYQKj1L83AK9ywk_hYMjEkcaxpIg6phbTf0/edit?usp=sharing). -1. Install [Filza File Manager](http://cydia.saurik.com/package/com.tigisoftware.filza/). -2. Install [NewTerm 2](https://chariz.com/get/newterm). -4. Download jre-16 for iOS and install it using Filza [here](https://github.com/PojavLauncherTeam/PojavLauncher_iOS/releases/download/v16-openjdk/openjdk-16-jre_16.0.0+git20201217.8383f41-2_iphoneos-arm.deb). -3. Download my modified java commands, and install it using Filza [here](https://cdn.discordapp.com/attachments/558829512633090048/834014323755319306/com.letschill.java_0.1_iphoneos-arm.deb). -4. Open NewTerm 2 and run `wget https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/master/lastSuccessfulBuild/artifact/bootstrap/standalone/target/Geyser.jar` -5. Run `java -jar Geyser.jar`. -6. You can find Geyser server running in MCPE! - -**Note:** -Due to iOS's environment, if your device has low specs, iOS might end up killing NewTerm 2 while you're playing, stopping the server. There is no fix for that because of how iOS works. - -You may encounter some issues. If you do, run `su` then enter the root password (default is `alpine`) for root access. Then, run the server like you normally would, and it should work just fine. - ## Setup Videos Setup tutorials in a variety of languages. diff --git a/_docs/geyser/standalone.md b/_docs/geyser/standalone.md new file mode 100644 index 0000000..3f370cc --- /dev/null +++ b/_docs/geyser/standalone.md @@ -0,0 +1,75 @@ +--- +layout: page +title: Geyser Standalone +permalink: /geyser/standalone/ +--- + +# Setup of Geyser Standalone + + +## Prerequisites + +- The server you are connecting to has to support the latest version of Minecraft: Java Edition (at this time this is Minecraft {{ site.data.versions.java }}) +The server itself does not have to be the latest version but does have to allow connections. If you're running the server on an older version, you can use the plugin [ViaVersion](https://www.spigotmc.org/resources/19254/). +- The device running Geyser must support Java 16 or later. If you need help installing or updating, please see [PaperMC's Java update page](https://paper.readthedocs.io/en/latest/java-update/index.html). +- If you are connecting to an online mode Java server, a paid Java account is required. If you are running the server, you can bypass this requirement for your server with [Floodgate](/floodgate/). +- Your Bedrock client has to be a supported version - at this time that is Bedrock version(s) {{ site.data.versions.bedrock }}. +- To allow Geyser Standalone to be reached outside the local network, Unlike Minecraft: Java Edition, Bedrock Edition runs on port 19132 on the UDP protocol. When port forwarding, make sure to allocate to 19132 UDP or another UDP port. +- Currently, Geyser does not support key signing. To disable it (on servers running version 1.19 and higher), follow these instructions: Spigot, Paper, & all forks: Set `enfore-secure-profile: false` in the `server.properties` file. On BungeeCord: Set `enforce_secure_profile: false` in your `config.yml`. Using Velocity: set `force-key-authentication = false` in your `velocity.toml`. + + +## Standalone Setup +Please keep in mind, you need some sort of computer or host to run Geyser Standalone on. Applications such as Termux on Android are capable of running Geyser, but this largely depends on how powerful your Android device is. Please do so at your own risk. Instructions to run Geyser on Termux can be found [here](/geyser/setup/#termux-android). + +1. Download a jar of Geyser from the [build server](https://ci.opencollab.dev/job/Geyser/job/master/). +2. Create a new folder for Geyser, and drop the jar in there. + +### GUI Setup (Recommended) +3. Double-click the jar file and all the necessary files for Geyser will be created. +4. Configure options such as the server you want to join in the Geyser config. A description of all options of the config can be found on the [Understanding the Config](/geyser/understanding-the-config/) page. +5. Stop the current instance of Geyser and re-run it. + +### Console Setup +3. Create a new bat or startup script, similar to the one you'd use for a Spigot or Paper server, and take a look at [this](/geyser/creating-a-startup-script/) page for what to put into it. +4. Run the startup script/bat, and all the necessary files for Geyser will be created. +5. Configure options such as the server you want to join in the Geyser config. A description of all options of the config can be found on the [Understanding the Config](/geyser/understanding-the-config/) page. +6. Stop the current instance of Geyser and re-run it. + +Once you're done, open up Minecraft: Bedrock Edition and in the **Friends** tab, Geyser should show up there. If it does not show up, just add the Java IPv4 address and Bedrock port. + +### Standalone Setup (Geyser and Floodgate are not on the same server) +If you want to offload Geyser's processing you can host Geyser (Standalone) somewhere else and make it redirect to your server. +**Warning:** Do not forget to edit the remote section of your Geyser config. +See the [Floodgate](/floodgate/) wiki page for more details. + +## Port Forwarding + +Unlike Minecraft: Java Edition, Bedrock Edition runs on port 19132 on the UDP protocol. When port forwarding, make sure to allocate to 19132 UDP or another UDP port. For many server hosting providers, you will simply need to change your Bedrock listening port (see [here](/geyser/supported-hosting-providers/) for a list of supported providers). + +## Termux (Android) +Please read the disclaimer [here](/geyser/setup/#standalone-setup) before continuing. +1. Download and install [Termux](https://termux.com/) +2. Run `pkg install openjdk-17` +3. Run `wget https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/master/lastSuccessfulBuild/artifact/bootstrap/standalone/build/libs/Geyser-Standalone.jar` +4. Run `java -jar Geyser-Standalone.jar` + +OR + +We have an automated setup script for clean Termux installs, which might not work for all users. If the manual guide above does not work, try this. +Run this to start the download/install: +``` +curl https://gist.githubusercontent.com/rtm516/e3e07d6595ee41e05a38b03c0f4d7a80/raw/install.sh | bash +``` + +## NewTerm 2 (iOS) +**Note:** A jailbreak is required. You can find what jailbreak to use for your device [here](https://docs.google.com/spreadsheets/d/11DABHIIqwYQKj1L83AK9ywk_hYMjEkcaxpIg6phbTf0/edit?usp=sharing). +1. Install [Filza File Manager](http://cydia.saurik.com/package/com.tigisoftware.filza/). +2. Install [NewTerm 2](https://chariz.com/get/newterm). +4. Download PojavLauncher's Java 16 JRE for iOS and install it using Filza [here](https://github.com/PojavLauncherTeam/PojavLauncher_iOS/releases/download/v16-openjdk/openjdk-16-jre_16.0.0+git20201217.8383f41-2_iphoneos-arm.deb). +3. Download this package containing modified java commands, and install it using Filza [here](https://cdn.discordapp.com/attachments/558829512633090048/834014323755319306/com.letschill.java_0.1_iphoneos-arm.deb) (Note: Not an official GeyserMC project, install at your own risk). +4. Open NewTerm 2 and run `wget https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/master/lastSuccessfulBuild/artifact/bootstrap/standalone/build/libs/Geyser-Standalone.jar` +5. Run `java -jar Geyser-Standalone.jar`. +6. Geyser should show up in the Friends tab inside Minecraft. + +**Note:** +Due to the iOS environment, if your device has low specs, iOS might end up killing NewTerm 2 while you're playing, stopping the server. There is no fix for that because of how iOS works. From a6ed6db9534f66745e2104678232df83a05ff273 Mon Sep 17 00:00:00 2001 From: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Fri, 7 Oct 2022 19:11:56 -0400 Subject: [PATCH 065/118] Basic update to dependency page for new Geyser API --- ...ing-geyser-or-floodgate-as-a-dependency.md | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/_docs/geyser/using-geyser-or-floodgate-as-a-dependency.md b/_docs/geyser/using-geyser-or-floodgate-as-a-dependency.md index 2bbf036..4e75abe 100644 --- a/_docs/geyser/using-geyser-or-floodgate-as-a-dependency.md +++ b/_docs/geyser/using-geyser-or-floodgate-as-a-dependency.md @@ -9,27 +9,19 @@ To start, add the Open Collaboration repository to your project: ```xml opencollab-snapshot-repo - https://repo.opencollab.dev/maven-snapshots/ - - false - - - true - + https://repo.opencollab.dev/main/ ``` ## Using Geyser -*Please note: this information will be updated with a new API at a later point, but the old API structure will continue to work.* - -Add Geyser's common codebase as a dependency: +Add Geyser's API codebase as a dependency: ```xml - org.geysermc - core - 2.0.0-SNAPSHOT + org.geysermc.geyser + api + 2.1.0-SNAPSHOT provided ``` @@ -37,12 +29,12 @@ Add Geyser's common codebase as a dependency: To get a Geyser player, or check if a player is from Bedrock: ```java -GeyserSession session = GeyserConnector.getInstance().getPlayerByUuid(uuid); +GeyserConnection connection = GeyserApi.api().connectionByUuid(uuid); ``` -`session` can be null if such a player does not exist on Geyser. +`connection` can be null if such a player does not exist on Geyser. -`GeyserConnector.getInstance()` will be null until after the Geyser plugin enables. +`GeyserApi.api()` may be null until after the Geyser plugin enables. ## Using Floodgate From b29b52feefaa93295610acc119a10c4ff93e2d23 Mon Sep 17 00:00:00 2001 From: Creeperz653 <76449952+Creeperz653@users.noreply.github.com> Date: Wed, 12 Oct 2022 22:28:30 -0700 Subject: [PATCH 066/118] Add new Skin API (#88) * Added a new api Added creepernation skin api * Changed desp * Update _docs/other/community-geyser-projects.md Co-authored-by: Olivia * Update _docs/other/community-geyser-projects.md Co-authored-by: Olivia Co-authored-by: Olivia --- _docs/other/community-geyser-projects.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/_docs/other/community-geyser-projects.md b/_docs/other/community-geyser-projects.md index 9589290..4ceb69d 100644 --- a/_docs/other/community-geyser-projects.md +++ b/_docs/other/community-geyser-projects.md @@ -38,6 +38,14 @@ A Spigot, BungeeCord, and Velocity plugin to create custom Bedrock Edition forms Creators: [Konicai](https://github.com/Konicai), [Jens](https://github.com/Jens-Co) +## CreeperNation Skin API + +An API to show Java or Bedrock skins depending on UUID or username + +* [Website](https://api-docs.creepernation.xyz) + +Creators: [creeperz653](https://github.com/creeperz653), [BlueTree242](https://github.com/BlueTree242) + ## CustomCommandPrefix A Spigot plugin that allows users to enter commands starting with `.`, to work around Xbox achievements being disabled. From 65d06d5d2ef6db28cd004abcda7b76ba7b1c424c Mon Sep 17 00:00:00 2001 From: Jens Collaert <63231928+Jens-Co@users.noreply.github.com> Date: Fri, 14 Oct 2022 07:33:42 +0200 Subject: [PATCH 067/118] Add new plugin into projects page. (#89) * Bot usage page. * thats stupid. * Update _docs/other/discord-bot-usage.md Co-authored-by: Olivia * Update _docs/other/discord-bot-usage.md Co-authored-by: Olivia * Update _docs/other/discord-bot-usage.md Co-authored-by: Olivia * Update _docs/other/discord-bot-usage.md Co-authored-by: Olivia * Update _docs/other/discord-bot-usage.md Co-authored-by: Olivia * Update _docs/other/discord-bot-usage.md Co-authored-by: Olivia * remove h3 * . * Add new plugin into projects page. * Update _docs/other/community-geyser-projects.md Thank you! Co-authored-by: Olivia Co-authored-by: Olivia --- _data/toc.yml | 2 +- _docs/other/community-geyser-projects.md | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/_data/toc.yml b/_data/toc.yml index 50d8d53..8b28aaf 100644 --- a/_data/toc.yml +++ b/_data/toc.yml @@ -96,4 +96,4 @@ - title: "Developer Guide" url: "other/developer-guide/" - title: "Community Geyser Projects" - url: "other/community-geyser-projects/" + url: "other/community-geyser-projects/" \ No newline at end of file diff --git a/_docs/other/community-geyser-projects.md b/_docs/other/community-geyser-projects.md index 4ceb69d..4911582 100644 --- a/_docs/other/community-geyser-projects.md +++ b/_docs/other/community-geyser-projects.md @@ -17,6 +17,14 @@ A list of other utilities that are useful with Geyser or for developing Geyser-l Maintainer: [bundabrg](https://github.com/bundabrg) +## BedrockFormShop + +A Spigot shop plugin that uses Bedrock forms. + +* [GitHub](https://github.com/kejonaMC/BedrockFormShop) + +Creator: [KejonaMC](https://github.com/kejonaMC) + ## BedrockSkinUtility This is a Fabric mod that allows you to view Bedrock capes from Java. From 4caa9a8f2680dff52424518e40b4e8d2f21f836a Mon Sep 17 00:00:00 2001 From: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Mon, 24 Oct 2022 13:33:57 -0400 Subject: [PATCH 068/118] Remove Geyser-Fabric wiki page --- _data/toc.yml | 2 -- _docs/geyser/setup.md | 2 +- _docs/other/geyser-fabric.md | 25 ------------------------- 3 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 _docs/other/geyser-fabric.md diff --git a/_data/toc.yml b/_data/toc.yml index 8b28aaf..ef62a60 100644 --- a/_data/toc.yml +++ b/_data/toc.yml @@ -89,8 +89,6 @@ url: "other/geyseroptionalpack/" - title: "GeyserConnect" url: "other/geyserconnect/" - - title: "Geyser-Fabric" - url: "other/geyser-fabric/" - title: "Test Server" url: "other/test-server/" - title: "Developer Guide" diff --git a/_docs/geyser/setup.md b/_docs/geyser/setup.md index a154465..54eca45 100644 --- a/_docs/geyser/setup.md +++ b/_docs/geyser/setup.md @@ -13,7 +13,7 @@ Bedrock clients will join through Geyser, and it will handle all the packet tran 2. Geyser for BungeeCord (also works on Waterfall), 3. Geyser for Velocity, 4. Geyser for Sponge, -5. Geyser for Fabric (does not support client required mods, and more info about that can be found [here](/other/geyser-fabric/)), +5. Geyser for Fabric (for setups that support vanilla Java clients; requires [Fabric API](https://www.curseforge.com/minecraft/mc-mods/fabric-api)), 6. Geyser Standalone (Standalone Setup instructions are [here](/geyser/standalone/)). The first five versions run as plugins/mods and can be installed directly onto the server. The standalone version can be used in a similar way, except you run it separately. diff --git a/_docs/other/geyser-fabric.md b/_docs/other/geyser-fabric.md deleted file mode 100644 index 74358b8..0000000 --- a/_docs/other/geyser-fabric.md +++ /dev/null @@ -1,25 +0,0 @@ ---- -layout: page -title: Geyser-Fabric -permalink: /other/geyser-fabric/ ---- - -# [Download here](https://ci.opencollab.dev/job/GeyserMC/job/Geyser-Fabric/job/master/) - -For the most part, Geyser-Fabric operates the same as other Geyser platforms. There are a couple of exceptions: - -- Geyser-Fabric is installed in the `mods` folder, and its config can be found in `config/Geyser-Fabric/config.yml` at the root of your server. -- Any mod that requires clientside installation in order to join the server will not permit Bedrock clients to join. -- Floodgate-Fabric can be found [here](https://github.com/GeyserMC/Floodgate-Fabric) -- You must install the Fabric API mod from [here](https://www.curseforge.com/minecraft/mc-mods/fabric-api). - -The source code can be found [here](https://github.com/GeyserMC/Geyser-Fabric). - -### permissions.yml - -This file located in `config/Geyser-Fabric` controls what commands non-opped players (both Bedrock and Java) are able to run. Uncomment the commands you want any player to run. - -### Why a separate repository? - -- By maintaining a separate repository, we can support multiple Minecraft versions easier. -- Fabric is built around the Gradle build tool, while Geyser is built around the Maven build tool. From 97d09a5c90aa750cc331a12d8c15b96d4e09645f Mon Sep 17 00:00:00 2001 From: onebeastchris <105284508+onebeastchris@users.noreply.github.com> Date: Wed, 26 Oct 2022 03:03:08 +0200 Subject: [PATCH 069/118] version bump (#94) Co-authored-by: onebeastchris --- _data/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/versions.json b/_data/versions.json index 2640e87..91fd1ac 100644 --- a/_data/versions.json +++ b/_data/versions.json @@ -1,4 +1,4 @@ { - "bedrock": "1.19.0 - 1.19.30", + "bedrock": "1.19.0 - 1.19.40", "java": "1.19.1/1.19.2" } From dce95c64617604d62b19e9829a6fa3476a7c5b35 Mon Sep 17 00:00:00 2001 From: onebeastchris <105284508+onebeastchris@users.noreply.github.com> Date: Sat, 29 Oct 2022 08:40:21 +0200 Subject: [PATCH 070/118] including new config options, removing old ones (#92) --- _docs/geyser/understanding-the-config.md | 59 +++++++++++++++++------- 1 file changed, 42 insertions(+), 17 deletions(-) diff --git a/_docs/geyser/understanding-the-config.md b/_docs/geyser/understanding-the-config.md index 4fd4416..c669976 100644 --- a/_docs/geyser/understanding-the-config.md +++ b/_docs/geyser/understanding-the-config.md @@ -7,11 +7,11 @@ permalink: /geyser/understanding-the-config/ This page covers basic information about the Geyser config and what each option does. Though they are explained in the configuration itself, this explains what each option does in more detail. ## Bedrock Section -The options for Geyser on the bedrock-facing end. Mostly contains options for how bedrock edition will see the server. +The options for Geyser on the Bedrock-facing end. Mostly contains options for how Bedrock edition will see the server. -**`address`**: The address of Geyser on the bedrock end. In most all scenarios, this should not need to be changed. +**`address`**: The address of Geyser on the Bedrock end. In most all scenarios, this should not need to be changed, unless you want to limit what IPs can connect to your server. Leave it at 0.0.0.0 (default), unless otherwise instructed in the setup guide. -**`port`**: The port Geyser will run on. By default, it is 19132 in bedrock. +**`port`**: The port Geyser will run on. By default, it is 19132 in Bedrock. If you are using a server hosting provider, you may not have this port available to you - in which case, read the setup guide to proceed. **`clone-remote-port`**: Some hosting services change your Java port everytime you start the server and require the same port to be used for Bedrock/UDP connections. This option makes the Bedrock port the same as the Java port every time you start the server. This option does not do anything on the Standalone version of Geyser. @@ -19,31 +19,36 @@ The options for Geyser on the bedrock-facing end. Mostly contains options for ho **`motd2`**: The second line of the MOTD for Geyser. **Please keep in mind, this option will only work if Geyser is shown in the Friends tab!** -**`server-name`**: The world name that is shown in the top-right area of the pause screen. +**`server-name`**: The world name that is shown in the top-right area of the pause menu and the settings menu. -**`compression-level`**: An number value that represents how much to compress outgoing traffic. Can be any number from -1 to 9; any other value will be replaced with the nearest acceptable value. The higher the number, the more CPU processing that is used but with less bandwidth used. +**`compression-level`**: An number value that represents how much to compress outgoing traffic. Can be any number from -1 to 9; any other value will be replaced with the nearest acceptable value. The higher the number, the more CPU processing that is used but with less bandwidth used. Default is 6. + +**`enable-proxy-protocol`**: Whether to enable PROXY protocol or not for clients. You DO NOT WANT this feature unless you run UDP reverse proxy in front of your Geyser instance. You do NOT need this for BungeeCord (and forks), Velocity, or Waterfall. + +**`proxy-protocol-whitelisted-ips`**: Disabled by default, and only enable this if you use "enable-proxy-protocol". A list of allowed PROXY protocol speaking proxy IP addresses/subnets. Should really only be used when you are not able to use a proper firewall (usually true with shared hosting providers etc.). Keeping this list empty means there is no IP address whitelist. Both IP addresses and subnets are supported. ## Remote Section -Options for the remote (java) server. +Options for the remote (Java) server. **`address`**: The address of the Minecraft: Java Edition server you want to join. By default, this value is `auto`. By keeping it as `auto`, the address, port, and Floodgate support will be automatically configured. In standalone, keeping this as `auto` sets the remote address to 127.0.0.1. -**`port`**: The port of the Minecraft: Java Edition server you specified in the `address` section. +**`port`**: The port of the Minecraft: Java Edition server you specified in the `address` section. For plugin versions, if address has been set to "auto", the port will also follow the server's listening port. -**`auth-type`**: The authentication type of the Minecraft: Java Edition server. Valid options are `online`, `offline`, and `floodgate`. +**`auth-type`**: The authentication type of the Minecraft: Java Edition server. Valid options are `online`, `offline`, and `floodgate`. **Please keep in mind, what you specify in the Geyser `auth-type` option MUST be the same as what the remote server has (with the exception of Geyser being in online mode and remote being in offline mode). You simply cannot join an online mode server without a genuine account. If you want to allow Minecraft: Bedrock Edition accounts to join without a Minecraft: Java Edition account, see the [Floodgate](/floodgate/) wiki page.** **`use-proxy-protocol`**: Whether to enable PROXY/HAProxy protocol or not while connecting to the server. This is useful only when: - Your server supports PROXY protocol (it probably doesn't) - You run Velocity or BungeeCord with its respective option enabled. +- IF YOU DON'T KNOW WHAT THIS IS, DON'T TOUCH IT! **`forward-hostname`**: Forwards the hostname/IP address that the Bedrock client used to connect over to the Java server. This is designed to be used for forced hosts on proxies. ## General Options General Geyser options that are mostly specific to Geyser itself. -**`floodgate-key-file`**: The key file path for Floodgate. Requires that you have [Floodgate](/floodgate/) installed and the `auth-type` set to `floodgate`. +**`floodgate-key-file`**: Floodgate uses encryption to ensure use from authorised sources. This should point to the public key generated by Floodgate (BungeeCord, Spigot or Velocity). You can ignore this when not using Floodgate. If you're using a plugin version of Floodgate on the same server, the key will automatically be picked up from Floodgate.The key file path for Floodgate. Requires that you have [Floodgate](/floodgate/) installed and the `auth-type` set to `floodgate`. **`saved-user-logins`**: For online mode authentication type only. Stores a list of Bedrock players that should have their Java Edition account saved after login. @@ -66,17 +71,17 @@ saved-user-logins: **`passthrough-protocol-name`**: Relay the protocol name (e.g. BungeeCord [X.X], Paper 1.X) - this is only really useful when using a custom protocol name! This will also show up on sites like MCSrvStatus. -**`passthrough-players`**: If the current and max player counts should be relayed from the remote server. +**`passthrough-player-count`**: If the current and max player counts should be relayed from the remote server. -**`legacy-ping-passthrough`**: If enabled, manually pings the server by impersonating a Minecraft client instead of using the server's API. **This option should *only* be enabled if your MOTD or player count is not accurate,** as it can cause errors especially on BungeeCord. This option does nothing on standalone. +**`legacy-ping-passthrough`**: If enabled, manually pings the server by impersonating a Minecraft client instead of using the server's API. **This option should *only* be enabled if your MOTD or player count is not accurate,** as it can cause errors especially on BungeeCord. This option does nothing on Geyser Standalone. **`ping-passthrough-interval`**: How often the fake Minecraft client should attempt to ping the remote server to update information, in seconds (a setting of 1 will ping the server every second; a setting of 3 will ping the server every three seconds). Only relevant for standalone and legacy ping passthrough. Increase the number if you're getting timeout or BrokenPipe exceptions. +**`forward-player-ping`**: Whether to forward player ping to the server. While enabling this will allow Bedrock players to have more accurate ping, it may also cause players to time out more easily. + **`max-players`**: The maximum amount of players shown when pinging the server. This does not actually cap how many players can join the Geyser instance at this time. The number will visually increase when pinging if the amount of players is greater, as Bedrock clients will not even attempt to join a full server. -**`debug-mode`**: If debug messages should be printed in console. Useful if you run into an error and need more context. - -**`general-thread-pool`**: The amount of threads Geyser will be able to use. Higher is not always better :P. +**`debug-mode`**: If debug messages should be printed in console. Useful if you run into an error and need more context. Yes, this will cause more messages, warnings or even errors in console - some packets aren't translated. **`allow-third-party-capes`**: If third party (Optifine, 5zig, LabyMod, etc.) capes should be displayed to the bedrock player. @@ -86,25 +91,45 @@ saved-user-logins: **`show-coordinates`**: Bedrock Edition has an option to show coordinates in the top-left part of your screen. This setting enables or disables this. +**`disable-bedrock-scaffolding`**: Whether Bedrock players are blocked from performing their scaffolding-style bridging. + +**`always-quick-change-armor`**: Whether Bedrock players can right-click outside their inventory to replace armor in their inventory, even if the armor slot is already occupied (which Java Edition doesn't allow). + **`emote-offhand-workaround`**: Since Java Edition 1.9, clients have had the ability to switch the item in their mainhand and offhand with a keybind. Bedrock Edition does not have this ability, so this config option makes up for it, If set, when a Bedrock player performs any emote, it will swap the offhand and mainhand items, just like the Java Edition keybind. There are three options this can be set to: - `disabled` - the default/fallback, which doesn't apply this workaround - `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. - -**`chunk-caching`**: Cache chunks for each Bedrock player, adds support for additional sounds and fixing movement issues at the expense of slightly more RAM usage. This option is always on for Spigot as we can use the server's API to get block information at no expense. *Geyser does not recommend disabling this option.* +**`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. **`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) **`allow-custom-skulls`**: Allows custom skulls to be displayed when placed. Keeping them enabled may cause a performance decrease on older/weaker devices. +**`max-visible-custom-skulls`**: The maximum number of custom skulls to be displayed per player. Increasing this may decrease performance on weaker devices. Setting this to -1 will cause all custom skulls to be displayed regardless of distance or number. + +**`custom-skull-render-distance`**: A number value specifying the radius in blocks around the player in which custom skulls are displayed. 32 by default. + +**`add-non-bedrock-items`**: Whether to add (at this time, only) the furnace minecart as a separate item in the game, which normally does not exist in Bedrock Edition. This should only need to be disabled if using a proxy that does not use the "transfer packet" style of server switching. If this is disabled, furnace minecart items will be mapped to hopper minecart items. This option requires a restart of Geyser in order to change its setting. + **`above-nether-bedrock-building`**: Bedrock prevents building and displaying blocks above Y127 in the Nether - enabling this config option works around that by changing the Nether dimension ID to the End ID. The main downside to this is that the sky will resemble that of the End sky in the Nether, but ultimately it's the only way for this feature to work. **`force-resource-packs`**: Force clients to load all resource packs if there are any. If set to false, it allows the user to disconnect from the server if they don't want to download the resource packs. **`xbox-achievements-enabled`**: Allows Xbox achievements to be unlocked. **This disables certain commands so the Bedrock client can't "cheat" to get them; this cannot be worked around if you want to enable this**. Commands such as /gamemode and /give will not work from Bedrock with this enabled. +**`log-player-ip-addresses`**: Whether player IP addresses will be logged by the server. + +**`notify-on-new-bedrock-update`**: Whether to alert the console and operators that a new Geyser version is available that supports a Bedrock version that this Geyser version does not support. It's recommended to keep this option enabled, as many Bedrock platforms auto-update. + +## Metrics + +bStats is a stat tracker that is entirely anonymous and tracks only basic information about Geyser, such as how many people are online, how many servers are using Geyser, what OS is being used, etc. You can learn more about bStats [here](https://bstats.org/). To see Geyser Stats, see [here](https://bstats.org/plugin/server-implementation/GeyserMC/). + +**`enabled`**: If metrics are enabled + +**`uuid`**: UUID of the server, don't change this! + ## Advanced Options **`scoreboard-packet-threshold`**: Geyser updates the Scoreboard after every Scoreboard packet, but when Geyser tries to handle a lot of scoreboard packets per second can cause serious lag. This option allows you to specify after how many Scoreboard packets per seconds the Scoreboard updates will be then limited to four updates per second. From f139dee69506a9570d69487cda65cc519bee33e3 Mon Sep 17 00:00:00 2001 From: onebeastchris Date: Mon, 7 Nov 2022 02:18:40 +0100 Subject: [PATCH 071/118] fix quicklink for built-in geyser (#95) --- _docs/geyser/setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_docs/geyser/setup.md b/_docs/geyser/setup.md index 54eca45..b9c7cec 100644 --- a/_docs/geyser/setup.md +++ b/_docs/geyser/setup.md @@ -32,7 +32,7 @@ The server itself does not have to be the latest version but does have to allow ## Plugin Setup 1. Read the Prerequisites above, especially if you are setting up Geyser for an older Minecraft Java Edition version! -2. To make sure you are using the easiest way to set up Geyser, please check whether your hosting provider features [built-in Geyser](/supported-hosting-providers/#built-in-geyser). If you are not using a hosting provider, or your hosting provider is not featured on said list, continue with the steps below. +2. To make sure you are using the easiest way to set up Geyser, please check whether your hosting provider features [built-in Geyser](/geyser/supported-hosting-providers/#built-in-geyser). If you are not using a hosting provider, or your hosting provider is not featured on said list, continue with the steps below. 3. If 2. does not apply: download a jar of Geyser from the [build server](https://ci.opencollab.dev/job/Geyser/job/master/) depending on what platform your server runs on. See the [FAQ](/geyser/faq/#which-plugin-version-of-geyser-do-i-need) if you're confused about which build to download. Keep in mind: Geyser-Spigot.jar is for Spigot and its forks, such as PaperMC or Purpur. 4. Put the Geyser jar file in your plugins folder and start up the server. 5. Port-forwarding: From 2ebb836d72c6ffc922999ceca3b2f0aebc9011be Mon Sep 17 00:00:00 2001 From: onebeastchris Date: Sun, 13 Nov 2022 17:33:51 +0100 Subject: [PATCH 072/118] removed dead links & providers, adjusted text (#93) * removed dead links & providers, adjusted text * whoopsie Co-authored-by: Olivia * Updated "FalixNodes" instructions - clone-remote-port doesnt work anymore ( https://discord.com/channels/613163671870242838/1041251970897412146 ) Added GPortal - seems like their support provides a port upon request ( https://discord.com/channels/613163671870242838/1041271158005317733 ) * Updated GPortal instructions - ( https://discord.com/channels/613163671870242838/1041271158005317733 ) Co-authored-by: Olivia --- _data/providers.json | 43 ++++++++++++++----------------------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/_data/providers.json b/_data/providers.json index 15ffabd..b5a417a 100644 --- a/_data/providers.json +++ b/_data/providers.json @@ -1,12 +1,12 @@ { "description_templates": { - "default": "Get Geyser as a plugin. Use the same port as your Java server for the Bedrock port in your config and connect with that port." + "default": "Get Geyser as a plugin, as in the [setup guide](https://wiki.geysermc.org/geyser/setup/). Use the same port as your Java server for the Bedrock port in your config (either by setting it yourself, or enabling \"clone-remote-port\") and connect with the same IP and port as you would on Java." }, "built_in": [ { "name": "Aternos", "url": "https://aternos.org/", - "description": "Select as a plugin in the Aternos plugin list and connect to your server with your Java IP and port. See [Aternos's article](https://support.aternos.org/hc/en-us/articles/360051047631) for more details." + "description": "Select as a plugin in the Aternos plugin list and connect to your server with your Java IP and port. See [Aternos's article](https://support.aternos.org/hc/en-us/articles/360051047631) for more details. \n Do note: Aternos automatically installs the latest version of the plugin, but does not auto update it. To update Geyser on aternos, simply reinstall the plugin (no need to uninstall the plugin/deleting the plugin files)." }, { "name": "Apex Hosting", @@ -170,23 +170,18 @@ { "name": "FalixNodes", "url": "https://falixnodes.net/", - "description_template": "default" + "description": "Get Geyser as a plugin. Need to ask to open a UDP port." }, { "name": "Ferox Hosting", "url": "https://feroxhosting.nl", - "description": "Get Geyser as a plugin. Open a port yourself in our panel and check out the [knowledgebase](https://kb.FeroxHosting.nl) for how to install and configure the plugin." + "description": "Get Geyser as a plugin. Open a port yourself in our panel and check out the [knowledgebase](https://feroxhosting.nl/kb/) for how to install and configure the plugin." }, { "name": "Fluctis Hosting", "url": "https://fluctishosting.com", "description_template": "default" }, - { - "name": "FreeMC.Host", - "url": "https://freemc.host/", - "description_template": "default" - }, { "name": "FreeMcServer.net", "url": "https://freemcserver.net", @@ -206,7 +201,12 @@ { "name": "Google Cloud", "url": "https://cloud.google.com/", - "description": "Not a dedicated Minecraft provider\n - 90 day/$300 free trial\n - [Tutorial for a Minecraft server Google Cloud](https://cloud.google.com/solutions/gaming/minecraft-server)\n - Note: You'll need to also allow port 19132 on UDP, use Paper instead of vanilla, and put Geyser in the plugins folder\n - You also don't need an SSD, they're just trying to make you pay more" + "description": "Not a dedicated Minecraft provider\n - 90 day/$300 free trial\n - \n - Note: You'll need to also allow port 19132 on UDP, use Paper instead of vanilla, and put Geyser in the plugins folder\n - You also don't need an SSD, they're just trying to make you pay more" + }, + { + "name": "GPortal", + "url": "https://www.g-portal.com/", + "description": "Get Geyser as a plugin. Need to ask to open a UDP port. Also, make sure your `bedrock` `address` in your Geyser config is your server IP." }, { "name": "Heavynode", @@ -236,7 +236,7 @@ { "name": "HumbleServers", "url": "https://humbleservers.com/", - "description": "Get Geyser as a plugin. Use the same port as your Java server for the Bedrock port in your config, or one of the two extra ports, and connect with that port. If the subdomain doesn't work, use your regular IP address with numbers." + "description": "Get Geyser as a plugin. Use the same port as your Java server for the Bedrock port in your config, or one of the two extra ports, and connect with that port. If the subdomain doesn't work, use your regular numbered IP address." }, { "name": "MC-HOST24.de", @@ -278,21 +278,11 @@ "url": "https://nitrado.net", "description": "Get Geyser as a plugin. Add 4 to the Port of the Java server. See [here](https://wiki.nitrado.net/en/How_to_install_GeyserMC_and_Floodgate) for specific instructions." }, - { - "name": "NightNodes", - "url": "https://nightnodes.com/", - "description_template": "default" - }, { "name": "Nodecraft", "url": "https://nodecraft.com", "description": "Get Geyser as a plugin. Use the default server port and 0.0.0.0 or your server IP as the host address." }, - { - "name": "NXYL.pro", - "url": "https://play.nxyl.pro", - "description": "Get Geyser as a plugin. Put the port provided by the host in your config.yml for the Java and bedrock sections, or create a port in the ports manager on the panel and use that for bedrock with the main one for Java, and you will be able to connect!" - }, { "name": "Oracle Cloud / OCI", "url": "https://www.oracle.com/cloud/", @@ -332,7 +322,7 @@ { "name": "Revivenode", "url": "https://revivenode.com/", - "description_template": "default" + "description": "Get Geyser as a plugin, as in the [setup guide](https://wiki.geysermc.org/geyser/setup/). Use the same port as your Java server for the Bedrock port in your config (either by setting it yourself, or enabling \"clone-remote-port\". Connect with the same IP and port as you would on Java. \n - See [here](https://wiki.geysermc.org/geyser/fixing-unable-to-connect-to-world/#bedrock-players-can-connect-after-hitting-the-server-on-a-tcp-port-eg-on-java-or-a-website-on-the-same-server-or-only-people-who-also-play-on-java-edition-can-join-from-geyser).\n - So if your players encounter this issue, please ask them to try to connect (even if they don't have Minecraft) from Java Edition first while their Bedrock client is opened, and after they should be able to join on Bedrock Edition." }, { "name": "SunriseNode", @@ -347,7 +337,7 @@ { "name": "Shockbyte", "url": "https://shockbyte.com/", - "description": "Use the same port as your Java server for the Bedrock address and port in your config and connect with that port. You can also see standalone installation instructions [here](https://shockbyte.com/billing/knowledgebase/173/Introduction-to-GeyserMCorDragonProxy-How-GeyserMC-Works.html)." + "description": "For Plugin install: use the same address and port as your Java server for the Bedrock address and port in your config and connect with that port. For Geyser Standalone installation instructions, see [here](https://shockbyte.com/billing/knowledgebase/173/Introduction-to-GeyserMCorDragonProxy-How-GeyserMC-Works.html)." }, { "name": "Skynode.pro", @@ -364,11 +354,6 @@ "url": "https://sparkedhost.com", "description_template": "default" }, - { - "name": "SpawnMC", - "url": "https://spawnmc.net/", - "description": "Get Geyser as a plugin. Use the same port as your Java server for the Bedrock port in your config and connect with that port; note that this provider only provides service in China." - }, { "name": "StellaNode", "url": "https://stellanode.com/", @@ -392,7 +377,7 @@ { "name": "Titan Nodes", "url": "https://titannodes.com/", - "description": "Get Geyser as a plugin. Use the Default server port and 0.0.0.0 as the host address." + "description": "Get Geyser as a plugin. Use the default server port and 0.0.0.0 as the host address." }, { "name": "TNAHosting", From 01f6c1407f07fd452cd80c4a75704ab97b6db610 Mon Sep 17 00:00:00 2001 From: Jens Collaert <63231928+Jens-Co@users.noreply.github.com> Date: Thu, 24 Nov 2022 22:05:14 +0100 Subject: [PATCH 073/118] Adding the bot command and usage page. (#87) * Bot usage page. * thats stupid. * Update _docs/other/discord-bot-usage.md Co-authored-by: Olivia * Update _docs/other/discord-bot-usage.md Co-authored-by: Olivia * Update _docs/other/discord-bot-usage.md Co-authored-by: Olivia * Update _docs/other/discord-bot-usage.md Co-authored-by: Olivia * Update _docs/other/discord-bot-usage.md Co-authored-by: Olivia * Update _docs/other/discord-bot-usage.md Co-authored-by: Olivia * remove h3 * rm space Co-authored-by: Olivia Co-authored-by: Tim203 --- _data/toc.yml | 4 ++- _docs/other/discord-bot-usage.md | 53 ++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 _docs/other/discord-bot-usage.md diff --git a/_data/toc.yml b/_data/toc.yml index ef62a60..07ead7a 100644 --- a/_data/toc.yml +++ b/_data/toc.yml @@ -94,4 +94,6 @@ - title: "Developer Guide" url: "other/developer-guide/" - title: "Community Geyser Projects" - url: "other/community-geyser-projects/" \ No newline at end of file + url: "other/community-geyser-projects/" + - title: "Geyser Discord Bot Usage" + url: "other/discord-bot-usage/" \ No newline at end of file diff --git a/_docs/other/discord-bot-usage.md b/_docs/other/discord-bot-usage.md new file mode 100644 index 0000000..501f81d --- /dev/null +++ b/_docs/other/discord-bot-usage.md @@ -0,0 +1,53 @@ +--- +layout: page +title: Discord Bot Usage +permalink: /other/discord-bot-usage/ +--- + +Our discord bot provides some very useful toos to debug/issue track your server. We will go in-depth on how to use the bot commands and its tools. + +## Server Logs + +If you are having console errors or Geyser isn't functioning/starting up, server logs are very useful to find the root cause of why Geyser is not running. You can safely share your server logs with [mclogs](https://mclo.gs) as it will remove all IP addresses and other sensitive information from the logs. + +If you paste the logs URL into our Discord, our bot will analyze the error and will give a fix if there is one present like seen below. You can also paste the `latest.log` file into Discord. + +![Example of an error](https://cdn.discordapp.com/attachments/613194762249437245/1021787041257767042/Naamloos.png) + +## OCR + +OCR or Optical Character Recognition is something that our discord bot can process, which means if you upload a picture/image into our discord that contains an error like seen below the bot might be able to help you out with our issue. + +![Example of an error](https://cdn.discordapp.com/attachments/613194762249437245/1021784112878600263/unknown.png) + +## Ping Server + +If you are not sure if your server is reachable from the outside you can use our ping tool. Using the ping command in #bot-spam; /ping "serverip" as seen below, The bot will check if your server is online/reachable. When you are not running your server on default port: java 25565 and bedrock 19132 you will need to specify the port like /ping "serverip:serverport". + +If the bot returns `Unable to find Java/Bedrock server at the requested address`, your server either is not running/setup properly or your firewall is blocking the connection. More info on how to setup Geyser can be found on the [Geyser Setup page](/geyser/setup/). + +![Example of the ping command](https://cdn.discordapp.com/attachments/613194762249437245/1021790089367535697/unknown.png) + +## Provider List + +Some hosting providers have unique setup methods for Geyser. If you do not know how to setup Geyser on your provider you can either checkout the [Geyser Host Provider List](/geyser/supported-hosting-providers/) manually, or use our bot command `/provider "providername"` as seen below. + +![Example of the provider command](https://cdn.discordapp.com/attachments/613194762249437245/1021791367585857587/unknown.png) + +## Download Command + +Sends the download link of the chosen program/plugin. `/download "Geyser"` or `/download "ViaVersion"` and so on. + +## Leaderboard Command + +Provides a link to the Geyser Bot XP leaderboards. + +## Rank Command + +You can give yourself two types of roles on our discord, "GeyserNews" and "Testers". You can use the command `/rank "chosen rank"` to give one to yourself. + +## Queue Command + +Displays Current global api skin queue upload times. + + From 262e1ab8472719d0ed9de98915a74f434ff0d305 Mon Sep 17 00:00:00 2001 From: onebeastchris Date: Thu, 24 Nov 2022 22:34:46 +0100 Subject: [PATCH 074/118] Update linking.md (#96) * Update linking.md Added info on how exactly player linking works (to avoid data "loss" after linking), and added info on how to unlink * fix spelling java account's; ender chest * Apply suggestions from code review Co-authored-by: Olivia Co-authored-by: Olivia --- _docs/floodgate/linking.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/_docs/floodgate/linking.md b/_docs/floodgate/linking.md index 7055e3a..1c8f823 100644 --- a/_docs/floodgate/linking.md +++ b/_docs/floodgate/linking.md @@ -8,6 +8,9 @@ permalink: /floodgate/linking/ Instructions and information about how to link can also be found here: https://link.geysermc.org/ Before we introduced Global Linking, you always had to link your Java and Bedrock account on every individual server you visited (that has Floodgate). Global Linking is here to fix that problem. Link once, join everywhere.
+ +Keep in mind: While having your accounts linked, you will use the Java account's location, inventory data, and achievements etc. regardless of which platform you sign in from (therefore, "synchronising" the player data). The player data from the Bedrock account will not be accessible until you unlink again. As a result, you should transfer everything (ender chest contents, items, armor) to the Java account before linking to not "lose" your Bedrock progress. If you forgot to do this, you can unlink, transfer everything over, and link again. + Global Linking is part of the [Global Api](https://wiki.geysermc.org/floodgate/features/#what-is-the-global-api) and uses the GlobalLinkServer to link your account. To be able to link your account you have to do the following: 1. Join the GlobalLinkServer with both your Java and Bedrock account (IP: `link.geysermc.org`, Java port: `25565`, Bedrock port: `19132`) @@ -16,6 +19,8 @@ Global Linking is part of the [Global Api](https://wiki.geysermc.org/floodgate/f 4. Enter the random number on the other account by typing `/linkaccount ` 5. You should get kicked from the server on both your Bedrock and Java account with the message that it had successfully linked your accounts. +To unlink your globally linked accounts, join the GlobalLinkServer (as described above for linking) on either Java or Bedrock, and use the `/unlinkaccount` command. + Global Linking should be enabled by default on every server running Floodgate 2.0, but in the case that you disabled it, you can enable it again by opening your Floodgate config and make sure that the `player-link` section looks similar to this: ```yml # Configuration for player linking From 0d7a3fa07f881d97c24c5d7f7b886872cc27394a Mon Sep 17 00:00:00 2001 From: Jozef Bonnar <42479938+jozefbonnar@users.noreply.github.com> Date: Thu, 24 Nov 2022 22:05:47 +0000 Subject: [PATCH 075/118] Added cosmic guard to FAQ (#90) * Added cosmic guard to FAQ * Specified which address to update * Taken comment out and generalised which config Co-authored-by: Tim203 --- _docs/geyser/faq.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/_docs/geyser/faq.md b/_docs/geyser/faq.md index 9902f31..f6576da 100644 --- a/_docs/geyser/faq.md +++ b/_docs/geyser/faq.md @@ -99,6 +99,14 @@ Yes, you can use Geyser as a plugin or a mod for your Minecraft server software ## Can I use Geyser with Ngrok? Unfortunately, Ngrok is TCP-only, so you will not be able to use Geyser with Ngrok. As an alternative, you can use [playit.gg](https://playit.gg), which supports both TCP and UDP. +## How do I setup [Cosmic Guard](https://cosmicguard.com/)? +1) You will need access to the host systems terminal. Note: This guide is for Linux systems only! +2) Setup a "Guard" select gaming then Minecraft: Bedrock edition. +3) Click setup for linux and run the guardian installer and start the service. +4) Run "guardian status" and take note of the "Local IP" it starts with "10.31.x.x". +5) Go to the Geyser config.yml and update the Bedrock address to the Local IP which you found above. +6) Restart the mc server and test it out, it should work for both Java and Bedrock. + ## Can I connect Geyser to an older server? If the server has ViaVersion and/or supports the latest Minecraft version, yes. However, we are unable to support older versions of Minecraft due to a limitation in our Java support library. From 3941fe2b395110cde0cd283ef57906c97af6c13b Mon Sep 17 00:00:00 2001 From: Eris Date: Thu, 24 Nov 2022 17:25:53 -0500 Subject: [PATCH 076/118] Add the 2 alternate options for console connecting to the list (#66) * h * Update _docs/geyser/using-geyser-with-consoles.md Co-authored-by: GeekCorner <45696571+GeekCornerGH@users.noreply.github.com> Co-authored-by: GeekCorner <45696571+GeekCornerGH@users.noreply.github.com> --- _docs/geyser/using-geyser-with-consoles.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_docs/geyser/using-geyser-with-consoles.md b/_docs/geyser/using-geyser-with-consoles.md index e27b679..bbd45f5 100644 --- a/_docs/geyser/using-geyser-with-consoles.md +++ b/_docs/geyser/using-geyser-with-consoles.md @@ -6,6 +6,8 @@ permalink: /geyser/using-geyser-with-consoles/ All consoles can join third-party servers - including Geyser servers - with workarounds. Xbox One, Nintendo Switch, and PS4 systems can join third-party servers using a third-party program called BedrockConnect. For technical information about the program, including how to run your own setup, see [their GitHub repository](https://github.com/Pugmatt/BedrockConnect) (*This program is not affiliated with GeyserMC*). Other methods are also available for use. +There is also a tool anyone can set up that allows you to connect to the server via adding a user to your friends list, as well as a tool admins can set up that allows connecting from a linked account of a user on the server. This tool can be found [here](https://github.com/rtm516/MCXboxBroadcast). + **NOTE: The main IP used for BedrockConnect is often blocked on consoles, if you run into issues with internet connection or joining servers after changing your DNS, consider using either one of the other BedrockConnect servers on the [BedrockConnect Github Page](https://github.com/Pugmatt/BedrockConnect), or the [Public GeyserConnect](https://www.geyserconnect.net) which allows connecting to both Java and Bedrock servers.** # Xbox One From c5109e9e733a2934bff2c70502a5bde095e912f4 Mon Sep 17 00:00:00 2001 From: Creeperz653 <76449952+Creeperz653@users.noreply.github.com> Date: Sat, 26 Nov 2022 12:27:29 -0800 Subject: [PATCH 077/118] Domain Update (#101) --- _docs/other/community-geyser-projects.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_docs/other/community-geyser-projects.md b/_docs/other/community-geyser-projects.md index 4911582..d1dcf42 100644 --- a/_docs/other/community-geyser-projects.md +++ b/_docs/other/community-geyser-projects.md @@ -50,7 +50,7 @@ Creators: [Konicai](https://github.com/Konicai), [Jens](https://github.com/Jens- An API to show Java or Bedrock skins depending on UUID or username -* [Website](https://api-docs.creepernation.xyz) +* [Website](https://api-docs.creepernation.net) Creators: [creeperz653](https://github.com/creeperz653), [BlueTree242](https://github.com/BlueTree242) From 792b859a079a7617c8193e8dffd9fc27d2b75f3f Mon Sep 17 00:00:00 2001 From: onebeastchris Date: Sun, 11 Dec 2022 23:44:38 +0100 Subject: [PATCH 078/118] fix -DPaper.IgnoreJavaVersion=true capitalisation (#104) * fix -DPaper.IgnoreJavaVersion=true capitalisation see the title https://discord.com/channels/613163671870242838/613168464634576897/1046833221842767952 thanks to Kastle for pointing it out * update paper update java link --- _docs/geyser/setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_docs/geyser/setup.md b/_docs/geyser/setup.md index b9c7cec..cd53834 100644 --- a/_docs/geyser/setup.md +++ b/_docs/geyser/setup.md @@ -24,7 +24,7 @@ If you are running a server, it is highly recommended you use one of the plugin ## Prerequisites - The server you are connecting to has to support the latest version of Minecraft Java Edition (at this time this is Minecraft {{ site.data.versions.java }}) The server itself does not have to be the latest version but does have to allow connections. If you're running the server on an older version, you can use the plugin [ViaVersion](https://www.spigotmc.org/resources/19254/), but do note that only **1.13.2 and any version above is officially supported**. For older versions, use Geyser Standalone, or Geyser on a proxy like Velocity or BungeeCord. -- The device running Geyser must support Java 16 or later. If you need help installing or updating, please see [PaperMC's Java update page](https://paper.readthedocs.io/en/latest/java-update/index.html). If you're running a version of Paper that does not support Java 16 or later, you can add the flag `-DPaper.ignoreJavaVersion=true` to your startup Java arguments to allow Paper to run on Java 16. You can run Geyser standalone on another device if a server software cannot be updated to use Java 16. +- The device running Geyser must support Java 16 or later. If you need help installing or updating, please see [PaperMC's Java update page](https://docs.papermc.io/misc/java-install). If you're running a version of Paper that does not support Java 16 or later, you can add the flag `-DPaper.IgnoreJavaVersion=true` to your startup Java arguments to allow Paper to run on Java 16. You can run Geyser standalone on another device if a server software cannot be updated to use Java 16. - If you are connecting to an online mode Java server, a paid Java account is required. If you are running the server, you can bypass this requirement for your server with [Floodgate](/floodgate/). - Your Bedrock client has to be a supported version - at this time that is Bedrock version(s) {{ site.data.versions.bedrock }}. - If you are running the server, you need to have a UDP port opened. See below for more instructions. From 5c24ad3e4129970205dc8818fb5dd458945fea1c Mon Sep 17 00:00:00 2001 From: Creeperz653 <76449952+Creeperz653@users.noreply.github.com> Date: Thu, 22 Dec 2022 12:06:12 -0800 Subject: [PATCH 079/118] Better wording / order change (#105) * Better wording/ order change While i was updating the wording i saw the ordering mistake * Update to ordering * Capital * Update community-geyser-projects.md --- _docs/other/community-geyser-projects.md | 30 ++++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/_docs/other/community-geyser-projects.md b/_docs/other/community-geyser-projects.md index d1dcf42..b00ab65 100644 --- a/_docs/other/community-geyser-projects.md +++ b/_docs/other/community-geyser-projects.md @@ -25,13 +25,6 @@ A Spigot shop plugin that uses Bedrock forms. Creator: [KejonaMC](https://github.com/kejonaMC) -## BedrockSkinUtility -This is a Fabric mod that allows you to view Bedrock capes from Java. - -* [GitHub](https://github.com/Camotoy/BedrockSkinUtility) - -Creator: [Camotoy](https://github.com/Camotoy) - ## Bedrock Player Manager for Floodgate A Spigot plugin that is able to run certain commands when a Bedrock player joins, or have Bedrock players able to bypass the anticheat, etc. @@ -39,6 +32,21 @@ A Spigot plugin that is able to run certain commands when a Bedrock player joins Creator: ofunny +## BedrockSkinUtility +This is a Fabric mod that allows you to view Bedrock capes from Java. + +* [GitHub](https://github.com/Camotoy/BedrockSkinUtility) + +Creator: [Camotoy](https://github.com/Camotoy) + +## CreeperNation Skin API + +An SkinAPI that displays Java or Bedrock skins based on the UUID or username. + +* [Website](https://docs.creepernation.net/skinapi) + +Creators: [creeperz653](https://github.com/creeperz653), [BlueTree242](https://github.com/BlueTree242) + ## CrossplatForms A Spigot, BungeeCord, and Velocity plugin to create custom Bedrock Edition forms and inventory menus through configurations. * [Spigot page](https://www.spigotmc.org/resources/101043/) @@ -46,14 +54,6 @@ A Spigot, BungeeCord, and Velocity plugin to create custom Bedrock Edition forms Creators: [Konicai](https://github.com/Konicai), [Jens](https://github.com/Jens-Co) -## CreeperNation Skin API - -An API to show Java or Bedrock skins depending on UUID or username - -* [Website](https://api-docs.creepernation.net) - -Creators: [creeperz653](https://github.com/creeperz653), [BlueTree242](https://github.com/BlueTree242) - ## CustomCommandPrefix A Spigot plugin that allows users to enter commands starting with `.`, to work around Xbox achievements being disabled. From 80628b4de526e3c72968d70ff8a844f88a64e42e Mon Sep 17 00:00:00 2001 From: onebeastchris Date: Tue, 27 Dec 2022 08:38:27 +0100 Subject: [PATCH 080/118] adding the unusable-space-block config option (#102) explains the unusable-space-block option in the geyser config, and give further example of how it works. --- _docs/geyser/understanding-the-config.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_docs/geyser/understanding-the-config.md b/_docs/geyser/understanding-the-config.md index c669976..b68a55b 100644 --- a/_docs/geyser/understanding-the-config.md +++ b/_docs/geyser/understanding-the-config.md @@ -122,6 +122,8 @@ saved-user-logins: **`notify-on-new-bedrock-update`**: Whether to alert the console and operators that a new Geyser version is available that supports a Bedrock version that this Geyser version does not support. It's recommended to keep this option enabled, as many Bedrock platforms auto-update. +**`unusable-space-block`**: Which item to use to mark unavailable slots in a Bedrock player inventory. Examples of this are the 2x2 crafting grid while in creative, or custom inventory menus with sizes different from the usual 3x9. A barrier block is the default item (minecraft:barrier is therefore the default value). Takes any Java Minecraft identifier, e.g. "minecraft:apple". + ## Metrics bStats is a stat tracker that is entirely anonymous and tracks only basic information about Geyser, such as how many people are online, how many servers are using Geyser, what OS is being used, etc. You can learn more about bStats [here](https://bstats.org/). To see Geyser Stats, see [here](https://bstats.org/plugin/server-implementation/GeyserMC/). From 5444906203cc120ff93d48dc18b3c823be6eab87 Mon Sep 17 00:00:00 2001 From: Adriel <79513978+adriellwc@users.noreply.github.com> Date: Thu, 29 Dec 2022 00:39:43 +0800 Subject: [PATCH 081/118] Fix bedrock nether config typo (#106) --- _docs/geyser/understanding-the-config.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_docs/geyser/understanding-the-config.md b/_docs/geyser/understanding-the-config.md index b68a55b..ed3088c 100644 --- a/_docs/geyser/understanding-the-config.md +++ b/_docs/geyser/understanding-the-config.md @@ -112,7 +112,7 @@ saved-user-logins: **`add-non-bedrock-items`**: Whether to add (at this time, only) the furnace minecart as a separate item in the game, which normally does not exist in Bedrock Edition. This should only need to be disabled if using a proxy that does not use the "transfer packet" style of server switching. If this is disabled, furnace minecart items will be mapped to hopper minecart items. This option requires a restart of Geyser in order to change its setting. -**`above-nether-bedrock-building`**: Bedrock prevents building and displaying blocks above Y127 in the Nether - enabling this config option works around that by changing the Nether dimension ID to the End ID. The main downside to this is that the sky will resemble that of the End sky in the Nether, but ultimately it's the only way for this feature to work. +**`above-bedrock-nether-building`**: Bedrock prevents building and displaying blocks above Y127 in the Nether - enabling this config option works around that by changing the Nether dimension ID to the End ID. The main downside to this is that the sky will resemble that of the End sky in the Nether, but ultimately it's the only way for this feature to work. **`force-resource-packs`**: Force clients to load all resource packs if there are any. If set to false, it allows the user to disconnect from the server if they don't want to download the resource packs. From 66019dbe0fa55014a1dabba8da804483bc967c69 Mon Sep 17 00:00:00 2001 From: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Fri, 30 Dec 2022 16:19:11 -0500 Subject: [PATCH 082/118] Create secure-chat.md --- _docs/geyser/secure-chat.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 _docs/geyser/secure-chat.md diff --git a/_docs/geyser/secure-chat.md b/_docs/geyser/secure-chat.md new file mode 100644 index 0000000..f9b11bc --- /dev/null +++ b/_docs/geyser/secure-chat.md @@ -0,0 +1,28 @@ +--- +layout: page +title: Geyser and Secure Chat +permalink: /geyser/secure-chat/ +--- + +In the 1.19 Java Edition updates, a mechanism for reporting player chat messages to Mojang was implemented. +Bedrock Edition does not support this reporting mechanism. +If your server or proxy settings require that every player joining supports this mechanism (which may be enabled by default), +Bedrock players will be unable to chat. + +Server administrators can disable this setting, but please note that Java players can join with certain mods that make their messages unreportable. + +For a technical explanation of Java's chat signing system, see this [article](https://gist.github.com/kennytv/ed783dd244ca0321bbd882c347892874). + +# Disabling + +*Vanilla, Spigot/Paper/forks, Fabric* + +Set `enforce-secure-profile: false` in [server.properties](https://minecraft.fandom.com/wiki/Server.properties) + +*BungeeCord and forks* + +Set `enforce_secure_profile: false` in [config.yml](https://www.spigotmc.org/wiki/bungeecord-configuration-guide/) + +*Velocity* + +Set `force-key-authentication = false` in [velocity.toml](https://github.com/PaperMC/Velocity/blob/dev/3.0.0/proxy/src/main/resources/default-velocity.toml#L19) From ff11f020fa3b35f0bce9bb519e7633fc58c73ab7 Mon Sep 17 00:00:00 2001 From: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Fri, 30 Dec 2022 16:19:41 -0500 Subject: [PATCH 083/118] Point to new Secure Chat page --- _docs/geyser/common-issues.md | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/_docs/geyser/common-issues.md b/_docs/geyser/common-issues.md index f01d0da..10bc95d 100644 --- a/_docs/geyser/common-issues.md +++ b/_docs/geyser/common-issues.md @@ -74,17 +74,7 @@ See [this page](/floodgate/issues/) for more information. ### Missing profile key. This server requires secure profiles. -*Vanilla, Spigot/Paper/forks, Fabric* - -Set `enforce-secure-profile: false` in [server.properties](https://minecraft.fandom.com/wiki/Server.properties) - -*BungeeCord and forks* - -Set `enforce_secure_profile: false` in [config.yml](https://www.spigotmc.org/wiki/bungeecord-configuration-guide/) - -*Velocity* - -Set `force-key-authentication = false` in [velocity.toml](https://github.com/PaperMC/Velocity/blob/dev/3.0.0/proxy/src/main/resources/default-velocity.toml#L19) +See [this page](/geyser/secure-chat/). ### Mojang Resetting Account Credentials This is unfortunately something we have no control over, and is most likely the case when you're running Geyser as a plugin on a server host or joining a friend far away from your location. If you're running Geyser locally, this should not happen to you, but what we recommend for servers is a plugin we make called [Floodgate](https://github.com/GeyserMC/Floodgate), which allows for Bedrock clients to join your server without needing a Java Edition account. Take a look [here](Floodgate) for more information. From e39a13ee20c8dabdfcee4abed2541d57daf2f0e9 Mon Sep 17 00:00:00 2001 From: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Fri, 30 Dec 2022 16:19:46 -0500 Subject: [PATCH 084/118] Point to new Secure Chat page --- _docs/geyser/setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_docs/geyser/setup.md b/_docs/geyser/setup.md index cd53834..25b321e 100644 --- a/_docs/geyser/setup.md +++ b/_docs/geyser/setup.md @@ -28,7 +28,7 @@ The server itself does not have to be the latest version but does have to allow - If you are connecting to an online mode Java server, a paid Java account is required. If you are running the server, you can bypass this requirement for your server with [Floodgate](/floodgate/). - Your Bedrock client has to be a supported version - at this time that is Bedrock version(s) {{ site.data.versions.bedrock }}. - If you are running the server, you need to have a UDP port opened. See below for more instructions. -- Currently, Geyser does not support key signing. To disable it (on servers running version 1.19 and higher), follow these instructions: Spigot, Paper, & all forks: Set `enfore-secure-profile: false` in the `server.properties` file. On BungeeCord: Set `enforce_secure_profile: false` in your `config.yml`. Using Velocity: set `force-key-authentication = false` in your `velocity.toml`. This will disable chat signing, which Geyser currently does not support. Be careful though: This will allow Java players who bypass chat signing with mods such as NoChatReports to join the server, and make them unreportable. For more info on chat reporting, see this [article](https://gist.github.com/kennytv/ed783dd244ca0321bbd882c347892874). +- 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/). ## Plugin Setup 1. Read the Prerequisites above, especially if you are setting up Geyser for an older Minecraft Java Edition version! From ac21b8eb6f586803d1f458d36f6e63028b954534 Mon Sep 17 00:00:00 2001 From: onebeastchris Date: Wed, 4 Jan 2023 21:57:01 +0100 Subject: [PATCH 085/118] version bump (#110) title --- _data/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_data/versions.json b/_data/versions.json index 91fd1ac..dd02819 100644 --- a/_data/versions.json +++ b/_data/versions.json @@ -1,4 +1,4 @@ { - "bedrock": "1.19.0 - 1.19.40", - "java": "1.19.1/1.19.2" + "bedrock": "1.19.20 - 1.19.51", + "java": "1.19.3" } From 377f315512a2a990cfb23fd14f7d85bc86d54f79 Mon Sep 17 00:00:00 2001 From: onebeastchris Date: Mon, 9 Jan 2023 22:42:51 +0100 Subject: [PATCH 086/118] lets not include recursive links (#112) --- _docs/floodgate/forms.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_docs/floodgate/forms.md b/_docs/floodgate/forms.md index 4e4895b..05b4d0b 100644 --- a/_docs/floodgate/forms.md +++ b/_docs/floodgate/forms.md @@ -8,7 +8,7 @@ permalink: /floodgate/forms/ Bedrock Edition has a cool exclusive feature called Forms.
Cumulus is the Forms API that we use in Geyser and Floodgate.
-The source code is available [here](/floodgate/forms/). You can access the Cumulus API through the [Floodgate API](/floodgate/api/). +The source code is available [here](https://github.com/GeyserMC/Cumulus). You can access the Cumulus API through the [Floodgate API](/floodgate/api/). Bedrock knows three types of Forms: * ModalForm From 4af32070ec20a872043bfbc9a3d8390f1660f024 Mon Sep 17 00:00:00 2001 From: onebeastchris Date: Sat, 28 Jan 2023 02:03:13 +0100 Subject: [PATCH 087/118] Fix floodgate command permission node (#117) fixes https://github.com/GeyserMC/GeyserWiki/issues/99 --- _docs/floodgate/features.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_docs/floodgate/features.md b/_docs/floodgate/features.md index c23f1fd..94eaadc 100644 --- a/_docs/floodgate/features.md +++ b/_docs/floodgate/features.md @@ -12,7 +12,7 @@ Floodgate 2.0 has a whitelist command, `fwhitelist`, that should be used for add You can also specify a UUID: `fwhitelist add 00000000-0000-0000-0009-01f64f65c7c3` -The permission node is `floodgate.command.whitelist`. +The permission node is `floodgate.command.fwhitelist`. ## What is the Global Api? The Global Api is an API that is available for every server. It currently includes: [Global Linking](#what-is-global-linking), [skin uploading](#what-is-skin-uploading), getting a xuid by gamertag, and getting a gamertag by xuid. From 80e5399bbe0fb05ac2270f2945c0b8a4f2ad4770 Mon Sep 17 00:00:00 2001 From: Tim203 Date: Sat, 28 Jan 2023 02:06:00 +0100 Subject: [PATCH 088/118] Add Cloud Nord to providers (#114) --- _data/providers.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/_data/providers.json b/_data/providers.json index b5a417a..2d65de2 100644 --- a/_data/providers.json +++ b/_data/providers.json @@ -13,6 +13,11 @@ "url": "https://apexminecrafthosting.com/", "description": "Full auto installation. Go to the `Customizations` tab in the panel and select `Enabled` under the `Geyser Auto Installer` option then restart and connect to your server with your Java IP and port. See [Apex's article](https://apexminecrafthosting.com/geysermc/) for more details." }, + { + "name": "Cloud Nord", + "url": "https://cloudnord.net/", + "description": "Go to their [Crossplay Server](https://cloudnord.net/minecraftcrossplay-server-hosting/) hosting section and simply order your server. Instructions on how to join are provided." + }, { "name": "CreeperHost", "url": "https://www.creeperhost.net/", From 6d08d55483369d04c536be358bbe8cb3578b9aa6 Mon Sep 17 00:00:00 2001 From: onebeastchris Date: Sat, 28 Jan 2023 02:07:24 +0100 Subject: [PATCH 089/118] Make link.geysermc.org link clickable (#111) * lets make the link clickable title * Update linking.md let's make it a real link --- _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 1c8f823..b54c839 100644 --- a/_docs/floodgate/linking.md +++ b/_docs/floodgate/linking.md @@ -5,7 +5,7 @@ permalink: /floodgate/linking/ --- ## What is Global Linking? -Instructions and information about how to link can also be found here: https://link.geysermc.org/ +Instructions and information about how to link can also be found here: [https://link.geysermc.org/](https://link.geysermc.org/) Before we introduced Global Linking, you always had to link your Java and Bedrock account on every individual server you visited (that has Floodgate). Global Linking is here to fix that problem. Link once, join everywhere.
From 438774732e67f4ac0fcf131aaf733994016bdf93 Mon Sep 17 00:00:00 2001 From: onebeastchris Date: Sat, 28 Jan 2023 02:19:47 +0100 Subject: [PATCH 090/118] Updated the floodgate setup page (#108) * updated the floodgate setup Adds to my tags pr https://github.com/GeyserMC/GeyserDiscordBot/pull/262 - but essentially, i've: - updated the floodgate uuid converter to the new one that works - changed floodgate-bukkit mentions to the spigot one - added floodgate-fabric - added info to floodgate on velocity - they have multiple options for player info forwarding * changed link locations moved floodgate-fabric download link; added FabricAPI download - thanks konicai! --- _docs/floodgate/setup.md | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/_docs/floodgate/setup.md b/_docs/floodgate/setup.md index 7997b1b..7539bf6 100644 --- a/_docs/floodgate/setup.md +++ b/_docs/floodgate/setup.md @@ -12,17 +12,18 @@ Geyser: [https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/master/](https:// ## Prerequisites - You must own/manage the server in order to add Floodgate. *If you do not own the server, Floodgate does not allow you to bypass logging into Java servers that require a Mojang Java account*. -- You must either be running Geyser as a [plugin](/geyser/setup/), or be running [Geyser Standalone](/geyser/setup/#standalone-setup). Floodgate does not replace Geyser. +- You must either be running Geyser as a [plugin](/geyser/setup/), or be running [Geyser Standalone](/geyser/standalone/). Floodgate does not replace Geyser. - `floodgate-spigot.jar` cannot be installed on CraftBukkit/Bukkit servers. ## Setting Up -*Any reference to Spigot here also refers to any compatible server software such as Paper.* +*Any reference to Spigot here also refers to any compatible server software such as Paper. For the proxy setup, backend server implies all the servers that are behind the proxy.* For BungeeCord/Velocity setups: you only are required to install Floodgate on the BungeeCord or Velocity proxy unless you want to use the Floodgate API on the backend servers - see [below](#installing-floodgate-also-on-spigot-servers-behind-bungeecord-or-velocity) for the installation process.        *Note:* Installing Floodgate on the backend servers will allow Bedrock player skins to display without the Bedrock player having to switch backend servers. - Download the Floodgate plugin from [here](https://ci.opencollab.dev/job/GeyserMC/job/Floodgate/job/master/) and add it to your plugins folder on your frontend server. - `floodgate-spigot.jar` for Spigot, Paper, etc + - `floodgate-fabric.jar` for Fabric, can be downloaded [here](https://ci.opencollab.dev/job/GeyserMC/job/Floodgate-Fabric/job/master/). (Requires [FabricAPI](https://www.curseforge.com/minecraft/mc-mods/fabric-api)) - `floodgate-bungee.jar` for BungeeCord, Waterfall, etc - `floodgate-velocity.jar` for Velocity - Change the `auth-type` in the Geyser config to `floodgate`. @@ -33,15 +34,15 @@ For BungeeCord/Velocity setups: you only are required to install Floodgate on th ### Installing Floodgate also on Spigot servers behind BungeeCord or Velocity -This is only needed when you want to use the Floodgate API on your Spigot server(s) behind a proxy. +This is only needed when you want to use the Floodgate API on your backend server(s) behind a proxy. - Install Floodgate on the proxy and on *all* backend servers as per the [previous instructions](/floodgate/setup/) -- Enable `ip_forward` in your BungeeCord `config.yml` if using BungeeCord -- Set `bungeecord` to `true` in your `spigot.yml` +- Enable `ip_forward` in your BungeeCord `config.yml` if using BungeeCord. For Velocity, set up "player-info-forwarding". +- Set `bungeecord` to `true` in your `spigot.yml`. When using Velocity, see their [guide](https://docs.papermc.io/velocity/player-information-forwarding), as they have multiple options that require different setups. - Start the proxy server. - Edit the Floodgate config on your proxy server and set `send-floodgate-data` to `true`. -- *Copy* the `key.pem` file in the proxy Floodgate config folder to all Spigot servers' Floodgate config folder. **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. -- Restart the Spigot servers and proxy server. +- *Copy* the `key.pem` file in the proxy Floodgate config folder to all backend servers' Floodgate config folder. **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. +- Restart the backend servers and proxy server. ## Changing/disabling the prefix @@ -52,12 +53,12 @@ In your Floodgate config, change `username-prefix` to whichever prefix you desir 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. ## Obtaining UUIDs for Floodgate players -Check your server logs, or use [this](https://floodgate-uuid.heathmitchell1.repl.co/) page. If this doesn't work, then try this method: +Check your server logs, or use [this](https://uuid.kejona.dev/) page. If this doesn't work, then try this method: -First, you'll need to get the XUID of the player. There are several third-party websites to find this, for example, this one (unaffiliated with Geyser). Make sure to choose "Hexidecimal." You'll need to enter the player's Xbox Gamertag, and, once submitted, and it should display the XUID in the format of `xxxxxxxxxxxxxxxx`. To turn the XUID into a UUID that Java Edition can recognize, you need to put the XUID in this format: `00000000-0000-0000-xxxx-xxxxxxxxxxxx`. If formatted right, Java Edition should accept it as a UUID. +First, you'll need to get the XUID of the player. There are several third-party websites to find this, for example, [this one](https://www.cxkes.me/xbox/xuid) (unaffiliated with Geyser). Make sure to choose "Hexidecimal." You'll need to enter the player's Xbox Gamertag, and, once submitted, and it should display the XUID in the format of `xxxxxxxxxxxxxxxx`. To turn the XUID into a UUID that Java Edition can recognize, you need to put the XUID in this format: `00000000-0000-0000-xxxx-xxxxxxxxxxxx`. If formatted right, Java Edition should accept it as a UUID. ## Using PlaceholderAPI -If you're using the Bukkit version of Floodgate, download the Placeholder plugin [here](https://github.com/rtm516/FloodgatePlaceholders/). Using the placeholders shouldn't require additional setup other than having [PlaceholderAPI](https://www.spigotmc.org/resources/6245/) installed. See the section above on installing Floodgate on backend servers if you wish to use this on BungeeCord. +If you're using the Spigot version of Floodgate, download the Placeholder plugin [here](https://github.com/rtm516/FloodgatePlaceholders/). Using the placeholders shouldn't require additional setup other than having [PlaceholderAPI](https://www.spigotmc.org/resources/6245/) installed. See the section above on installing Floodgate on backend servers if you wish to use this on BungeeCord. ## Using Skript -If you're using the Bukkit version of Floodgate, there is an unofficial plugin that adds Skript support [here](https://github.com/Camotoy/floodgate-skript). +If you're using the Spigot version of Floodgate, there is an unofficial plugin that adds Skript support [here](https://github.com/Camotoy/floodgate-skript). From 3df3ee4e47809eefdc5462819128fc6056e50012 Mon Sep 17 00:00:00 2001 From: onebeastchris Date: Mon, 30 Jan 2023 03:17:21 +0100 Subject: [PATCH 091/118] geyser.jar is now geyser-standalone.jar (#120) java 16+ is also required nowadays --- _docs/geyser/creating-a-startup-script.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/_docs/geyser/creating-a-startup-script.md b/_docs/geyser/creating-a-startup-script.md index 214abc3..dec5e24 100644 --- a/_docs/geyser/creating-a-startup-script.md +++ b/_docs/geyser/creating-a-startup-script.md @@ -4,15 +4,15 @@ title: Creating a Startup Script permalink: /geyser/creating-a-startup-script/ --- -**In order for this to work, you MUST have Java 8 installed!** +**In order for this to work, you MUST have Java 16 (or higher) installed!** -Once you have downloaded and placed Geyser into its own folder, you will need to create a startup script; similar to how you'd run a Bukkit server. +Once you have downloaded and placed Geyser into its own folder, you will need to create a startup script; similar to how you'd run a Bukkit/Spigot/Paper server. ### Windows -* Create a new text file in the same location as the Geyser jar file, and call it `run.bat`. Open this with a text editor (preferably Notepad++), and insert the text below: +* Create a new text file in the same location as the Geyser-Standalone jar file, and call it `run.bat`. Open this with a text editor (preferably Notepad++), and insert the text below: ```batch @echo off -java -Xms1024M -jar Geyser.jar +java -Xms1024M -jar Geyser-Standalone.jar pause ``` * Double-click the **run.bat**, and Geyser should start up. Geyser will generate all the needed files. @@ -23,7 +23,7 @@ pause ```sh #!/bin/bash cd "$( dirname "$0" )" -java -Xms1024M -jar Geyser.jar +java -Xms1024M -jar Geyser-Standalone.jar ``` * Open Terminal, and type in `chmod a+x` **(Do NOT press return!)**, and drag your *run.command* file into the Terminal. * Press return on your keyboard, and Geyser will start up. Geyser will generate all the needed files. @@ -34,7 +34,7 @@ java -Xms1024M -jar Geyser.jar ```sh #!/bin/sh cd "$( dirname "$0" )" -java -Xms1024M -jar Geyser.jar +java -Xms1024M -jar Geyser-Standalone.jar ``` * In your default terminal application, make the file executable by running `chmod +x ~(dir)/run.sh` where `dir` is the name of the folder Geyser is in, or by changing the file permissions; * Open your default terminal application, and type `./run.sh` to run Geyser. Geyser will generate all the needed files. From b92c245b9b1a5f630dd06f4b4db2524263f44181 Mon Sep 17 00:00:00 2001 From: onebeastchris Date: Mon, 30 Jan 2023 03:49:26 +0100 Subject: [PATCH 092/118] update mc-host instructions (#118) see https://discord.com/channels/613163671870242838/613168464634576897/1069038712605917195 --- _data/providers.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/providers.json b/_data/providers.json index 2d65de2..d0cccf4 100644 --- a/_data/providers.json +++ b/_data/providers.json @@ -246,7 +246,7 @@ { "name": "MC-HOST24.de", "url": "https://mc-host24.de/", - "description": "Get Geyser as a plugin. Use the same address as your Java server for the Bedrock address in your config." + "description_template": "default" }, { "name": "Meloncube", From db7d17a4fe26a10c86e3cbe5b15925993f0224a1 Mon Sep 17 00:00:00 2001 From: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Wed, 1 Feb 2023 21:21:38 -0500 Subject: [PATCH 093/118] Iron golem cracked texture is now not exclusive to GeyserOptionalPack --- _docs/other/geyseroptionalpack.md | 1 - 1 file changed, 1 deletion(-) diff --git a/_docs/other/geyseroptionalpack.md b/_docs/other/geyseroptionalpack.md index 89263c2..969a601 100644 --- a/_docs/other/geyseroptionalpack.md +++ b/_docs/other/geyseroptionalpack.md @@ -9,7 +9,6 @@ GeyserOptionalPack is a Bedrock resource pack that adds more features to Geyser - Armor stand poses and arm/baseplate visibility - Illusioner texture -- Iron golem cracked texture - Missing particles, like sweep attack - Spectral arrow entity texture From 7c99676887c2d3516afc02fc2af7bb0fa65ce83e Mon Sep 17 00:00:00 2001 From: Evangelos Date: Wed, 8 Feb 2023 16:22:03 +0200 Subject: [PATCH 094/118] Spartan AntiCheat Adjustment (#123) Since early January 2023, bedrock detections for the Spartan AntiCheat are available fully by the default file/purchase and without the need for an additional purchase like previously, so I've adjusted its description and list. --- _docs/geyser/anticheat-compatibility.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_docs/geyser/anticheat-compatibility.md b/_docs/geyser/anticheat-compatibility.md index 0a869e8..2ab8a3a 100644 --- a/_docs/geyser/anticheat-compatibility.md +++ b/_docs/geyser/anticheat-compatibility.md @@ -14,6 +14,7 @@ Full Compatibility (Checks Bedrock Players Accurately) - [Themis](https://www.spigotmc.org/resources/90766/){:target="_blank"} - Last Updated on 15th Jun 2022 - [Negativity V2](https://www.spigotmc.org/resources/86874/){:target="_blank"} (Paid) - Last Updated on 21st March 2022 - [SoaromaSAC](https://www.spigotmc.org/resources/87702/){:target="_blank"} - Last Updated on 27th March 2022 +- [Spartan](https://www.spigotmc.org/resources/25638/){:target="_blank"} (Paid) - Last Updated on 8th February 2023 Partially Compatible (Does not Check/Ignores Bedrock Players) @@ -21,7 +22,6 @@ Partially Compatible (Does not Check/Ignores Bedrock Players) - [Flappy Anticheat](https://www.spigotmc.org/resources/92180/){:target="_blank"} - Last Updated on 14th September 2021 - [GrimAC](https://github.com/MWHunter/Grim){:target="_blank"} - Last Updated on 24th March 2022 - [Matrix](https://matrix.rip/){:target="_blank"} (Paid) - Last updated on 2nd September 2021 -- [Spartan](https://www.spigotmc.org/resources/25638/){:target="_blank"} (Spartan Syn offers full Bedrock checks for an additional $43) (Paid) - Last Updated on 19th August 2021 - [Vulcan](https://www.spigotmc.org/resources/83626/){:target="_blank"} (Paid) - Last Updated on 19th August 2021 - [Verus](https://verus.ac){:target="_blank"} (Paid) - Last Updated on 13th July 2022 From 54decef6463c7b21db057829055b54ed0e203b84 Mon Sep 17 00:00:00 2001 From: onebeastchris Date: Fri, 10 Feb 2023 15:10:44 +0100 Subject: [PATCH 095/118] version bump (#125) 1.19.60 is also supported --- _data/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/versions.json b/_data/versions.json index dd02819..cdbe513 100644 --- a/_data/versions.json +++ b/_data/versions.json @@ -1,4 +1,4 @@ { - "bedrock": "1.19.20 - 1.19.51", + "bedrock": "1.19.20 - 1.19.60", "java": "1.19.3" } From 0d695373fdcb3ee5443f6489c85265da90e39852 Mon Sep 17 00:00:00 2001 From: rtm516 Date: Fri, 10 Feb 2023 15:24:18 +0000 Subject: [PATCH 096/118] Update index.md --- pages/index.md | 74 ++------------------------------------------------ 1 file changed, 3 insertions(+), 71 deletions(-) diff --git a/pages/index.md b/pages/index.md index 11067d1..19ceb70 100644 --- a/pages/index.md +++ b/pages/index.md @@ -3,74 +3,6 @@ layout: page permalink: / --- - - -

- -
-
-
-
-
-

What is Geyser?

-

Geyser is a proxy, bridging the gap between Minecraft: Bedrock Edition and Minecraft: Java Edition servers. The ultimate goal of this project is to allow Minecraft: Bedrock Edition users to join Minecraft: Java Edition servers as seamlessly as possible to allow for true cross-platform.

-
-
-
image of bedrock client on java edition server
-
-
-
-
-
-
-
-
- -
-
-

How do I use it?

-

Geyser can be downloaded from our Jenkins server here and setup installations can be found on our wiki or in the tutorial video. Geyser can be used to join any modern Java server and doesn't require anything extra to be done on their end.

-
-
-
-
-
-
-
-
-

How does it work?

-

Geyser is a middleware, which translates all the incoming and outgoing packets. With this being said, Geyser works as a standalone proxy, meaning you can use it to join any modern Minecraft Java server. Geyser can also be installed on your server as a plugin, so you can easily make your server compatible with Minecraft: Bedrock Edition.

-
-
-
diagram of bedrock edition to geyser to java edition
-
-
-
-
-
-
-
-
-

Join from anywhere

-

Geyser can be joined from Windows 10, iOS, Android, and even consoles - (see here - for how to set this up!) Geyser is tested working with a - wide array of hosting providers, - and, if you own the server, you aren't limited by a Java account with our Floodgate - plugin!

-
-
-
-
- - \ No newline at end of file +geyser logo +# GeyserMC Wiki +Here you will find setup guides, FAQs and other information about GeyserMC projects including but not limited to Geyser and Floodgate. You can access the various pages from the sidebar on the left. From 9f7c35afcda9eb746ecc807229d0f8949d34e0ef Mon Sep 17 00:00:00 2001 From: rtm516 Date: Fri, 10 Feb 2023 15:24:50 +0000 Subject: [PATCH 097/118] Update index.md Woops forgot a new line --- pages/index.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pages/index.md b/pages/index.md index 19ceb70..a9b7d79 100644 --- a/pages/index.md +++ b/pages/index.md @@ -4,5 +4,7 @@ permalink: / --- geyser logo + # GeyserMC Wiki + Here you will find setup guides, FAQs and other information about GeyserMC projects including but not limited to Geyser and Floodgate. You can access the various pages from the sidebar on the left. From ecf2993583f908ee432a548f68c0e2b83bba19a9 Mon Sep 17 00:00:00 2001 From: rtm516 Date: Sun, 12 Feb 2023 14:18:33 +0000 Subject: [PATCH 098/118] Mark GeyserAndroid as discontinued --- _docs/geyser/using-geyser-with-consoles.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_docs/geyser/using-geyser-with-consoles.md b/_docs/geyser/using-geyser-with-consoles.md index bbd45f5..06a17c2 100644 --- a/_docs/geyser/using-geyser-with-consoles.md +++ b/_docs/geyser/using-geyser-with-consoles.md @@ -45,7 +45,7 @@ If you have a PC, you can use [Phantom](https://github.com/jhead/phantom). ### Using an Android Device If you have an Android device, you have several options: -- ~~[Geyser Android app](https://github.com/GeyserMC/GeyserAndroid)~~ (Currently out of date) +- ~~[Geyser Android app](https://github.com/GeyserMC/GeyserAndroid)~~ (Discontinued) - [BedrockTogether](https://play.google.com/store/apps/details?id=pl.extollite.bedrocktogetherapp) - [MC Lan Proxy (Trial)](https://play.google.com/store/apps/details?id=com.luzenna.mineproxydroidtrial) - [MC Lan Proxy (Paid)](https://play.google.com/store/apps/details?id=com.luzenna.mineproxydroid) From 1fb95564334d0e59150b2b1c67dac60da8d6e7cb Mon Sep 17 00:00:00 2001 From: GStudiosX <76548041+GStudiosX2@users.noreply.github.com> Date: Fri, 17 Feb 2023 21:30:37 +0000 Subject: [PATCH 099/118] Update Minehut description in providers (#129) Co-authored-by: Olivia --- _data/providers.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/providers.json b/_data/providers.json index d0cccf4..7787a9c 100644 --- a/_data/providers.json +++ b/_data/providers.json @@ -51,7 +51,7 @@ { "name": "Minehut", "url": "https://minehut.com/", - "description": "Connect via `bedrock.minehut.com` and do `/join `." + "description": "Connect via `bedrock.minehut.com` and do `/join `, or connect directly via `.bedrock.minehut.gg`." }, { "name": "MixmlHosting", From 0c4ed7c8a6d8c292ce165835b0ff0acbfc3d8d7f Mon Sep 17 00:00:00 2001 From: AgentDeath253 <82530339+AgentDeath253@users.noreply.github.com> Date: Wed, 22 Feb 2023 01:02:15 -0800 Subject: [PATCH 100/118] Updated falixnodes on providers list (#116) * Update providers.json Updated falix * Update providers.json * Update providers.json * Update providers.json * Update _data/providers.json Co-authored-by: rtm516 --------- Co-authored-by: rtm516 --- _data/providers.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/providers.json b/_data/providers.json index 7787a9c..790854e 100644 --- a/_data/providers.json +++ b/_data/providers.json @@ -175,7 +175,7 @@ { "name": "FalixNodes", "url": "https://falixnodes.net/", - "description": "Get Geyser as a plugin. Need to ask to open a UDP port." + "description": "Get Geyser as a plugin. Open a port yourself on the network page in the game panel, then change the port under the bedrock section of the Geyser config." }, { "name": "Ferox Hosting", From e3ead4d39c551b7aa304b2c240ef8253270d277b Mon Sep 17 00:00:00 2001 From: onebeastchris Date: Mon, 27 Feb 2023 20:15:53 +0100 Subject: [PATCH 101/118] version bump (#130) 1.19.63 is the latest supported version --- _data/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/versions.json b/_data/versions.json index cdbe513..5eae12b 100644 --- a/_data/versions.json +++ b/_data/versions.json @@ -1,4 +1,4 @@ { - "bedrock": "1.19.20 - 1.19.60", + "bedrock": "1.19.20 - 1.19.63", "java": "1.19.3" } From 39893273e5b9e6ee189aadcbbd1d4531280cb3c2 Mon Sep 17 00:00:00 2001 From: onebeastchris Date: Sun, 12 Mar 2023 00:23:45 +0100 Subject: [PATCH 102/118] fix download links (#131) * fix download link * fix download link in text --- _docs/geyser/setup.md | 6 +++--- _docs/geyser/standalone.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/_docs/geyser/setup.md b/_docs/geyser/setup.md index 25b321e..db4cbab 100644 --- a/_docs/geyser/setup.md +++ b/_docs/geyser/setup.md @@ -33,7 +33,7 @@ The server itself does not have to be the latest version but does have to allow ## Plugin Setup 1. Read the Prerequisites above, especially if you are setting up Geyser for an older Minecraft Java Edition version! 2. To make sure you are using the easiest way to set up Geyser, please check whether your hosting provider features [built-in Geyser](/geyser/supported-hosting-providers/#built-in-geyser). If you are not using a hosting provider, or your hosting provider is not featured on said list, continue with the steps below. -3. If 2. does not apply: download a jar of Geyser from the [build server](https://ci.opencollab.dev/job/Geyser/job/master/) depending on what platform your server runs on. See the [FAQ](/geyser/faq/#which-plugin-version-of-geyser-do-i-need) if you're confused about which build to download. Keep in mind: Geyser-Spigot.jar is for Spigot and its forks, such as PaperMC or Purpur. +3. If 2. does not apply: download a jar of Geyser from the [build server](https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/master/) depending on what platform your server runs on. See the [FAQ](/geyser/faq/#which-plugin-version-of-geyser-do-i-need) if you're confused about which build to download. Keep in mind: Geyser-Spigot.jar is for Spigot and its forks, such as PaperMC or Purpur. 4. Put the Geyser jar file in your plugins folder and start up the server. 5. Port-forwarding: - If you are using a hosting provider, you will likely need to change your Bedrock port in `config.yml`. Information on your hosting provider might be available on the [Supported Hosting Providers](/geyser/supported-hosting-providers/) page. If there is no information on your hosting provider and you are unable to assign/open ports yourself, try enabling `clone-remote-port` in Geyser's `config.yml`file and connecting with the same IP/port as you would with Java Edition. @@ -62,7 +62,7 @@ The Bedrock clients, like Java clients, should connect to the proxy server, and #### Setup: 1. Make sure Velocity/BungeeCord is up-to-date. The proxy can be newer than the servers behind it (also called backend servers). If you're running the backend servers on an older version then the current {{ site.data.versions.java }}, you can use the plugin [ViaVersion](https://www.spigotmc.org/resources/19254/). It is recommended to have the plugin on all backend servers where necessary, instead to having it on the proxy. -2. Download a jar of Geyser from the [build server](https://ci.opencollab.dev/job/Geyser/job/master/) depending on what platform your server runs on. See the [FAQ](/geyser/faq/#which-plugin-version-of-geyser-do-i-need) if you're confused about which build to download. +2. Download a jar of Geyser from the [build server](https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/master/) depending on what platform your server runs on. See the [FAQ](/geyser/faq/#which-plugin-version-of-geyser-do-i-need) if you're confused about which build to download. 3. Put the Geyser jar file in your plugins folder and start up the server. 4. Port-forwarding: - If you are using a hosting provider, you will likely need to change your Bedrock port in the `config.yml` file. Information on your hosting provider might be available on the [Supported Hosting Providers](/geyser/supported-hosting-providers/) page. If your hosting provider is not listed there, and you are unable to port forward the default 19132 port on UDP, try setting `clone-remote-port` to true and connecting with the Java IP and port. Any port will work, as long as the UDP protocol is not blocked or already in use by the query feature (see `server.properties`) or another mod. @@ -86,7 +86,7 @@ Please read [Standalone Setup](/geyser/standalone/) to set up Geyser Standalone. Unlike Minecraft Java Edition, Bedrock Edition runs on port 19132 on the UDP protocol. When port forwarding, make sure to allocate to 19132 UDP or another UDP port. For many server hosting providers, you will simply need to change your Bedrock listening port (see [here](/geyser/supported-hosting-providers/) for a list of supported providers). ## Setup Videos -Setup tutorials in a variety of languages. +Setup tutorials in a variety of languages. Do note: Some might be outdated - but the written guide above is up-to-date. ### English **Connect to Java servers from Bedrock Edition! | GeyserMC Proxy Tutorial by [raimuakuna](https://www.youtube.com/channel/UCIMZsNCD_-prDETwRypAqmQ)** diff --git a/_docs/geyser/standalone.md b/_docs/geyser/standalone.md index 3f370cc..276c3b6 100644 --- a/_docs/geyser/standalone.md +++ b/_docs/geyser/standalone.md @@ -21,7 +21,7 @@ The server itself does not have to be the latest version but does have to allow ## Standalone Setup Please keep in mind, you need some sort of computer or host to run Geyser Standalone on. Applications such as Termux on Android are capable of running Geyser, but this largely depends on how powerful your Android device is. Please do so at your own risk. Instructions to run Geyser on Termux can be found [here](/geyser/setup/#termux-android). -1. Download a jar of Geyser from the [build server](https://ci.opencollab.dev/job/Geyser/job/master/). +1. Download a jar of Geyser from the [build server](https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/master/). 2. Create a new folder for Geyser, and drop the jar in there. ### GUI Setup (Recommended) From bca2a5414233bc250a593cf0f5db8d7bc4714111 Mon Sep 17 00:00:00 2001 From: onebeastchris Date: Thu, 16 Mar 2023 03:34:29 +0100 Subject: [PATCH 103/118] version bump (#132) --- _data/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_data/versions.json b/_data/versions.json index 5eae12b..584f560 100644 --- a/_data/versions.json +++ b/_data/versions.json @@ -1,4 +1,4 @@ { - "bedrock": "1.19.20 - 1.19.63", - "java": "1.19.3" + "bedrock": "1.19.30 - 1.19.70", + "java": "1.19.4" } From 9e90741ebd11c403e5fb356455f73a67955f14a4 Mon Sep 17 00:00:00 2001 From: onebeastchris Date: Sat, 18 Mar 2023 14:09:53 +0100 Subject: [PATCH 104/118] minor changes (#121) --- _docs/geyser/faq.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/_docs/geyser/faq.md b/_docs/geyser/faq.md index f6576da..53562a9 100644 --- a/_docs/geyser/faq.md +++ b/_docs/geyser/faq.md @@ -46,12 +46,13 @@ This is a non-complete list of what platform each plugin version of Geyser is fo * Any other forks of the above * Geyser-Velocity works with [Velocity](https://www.velocitypowered.com/) * Geyser-Sponge works with [SpongeVanilla or SpongeForge](https://www.spongepowered.org/) +* Geyser-Fabric works with [Fabric](https://www.fabricmc.net/) ## Which type of Geyser version is better, standalone or plugin? 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. ## What server versions does Geyser-Spigot support? -The Geyser-Spigot plugin supports any Minecraft server version 1.12.2 or later. Any earlier version is not supported by the plugin - use a proxy version or the standalone build instead. +The Geyser-Spigot plugin supports any Minecraft server version 1.13.2 or later. Any earlier version is not supported by the plugin - use a proxy version or the standalone build instead. ## If using BungeeCord or another fork, where do I need to put Geyser/Floodgate? You only need Geyser and/or Floodgate on the BungeeCord server, as long as not using the Floodgate API. In this case, Floodgate is needed on the "backend" servers as well. @@ -62,7 +63,7 @@ Generally, the IP that Bedrock players will join with is your Java IP and the de ## How can I have Bedrock players load resource packs? -You can add Bedrock resource packs to your Geyser installation in the `packs` folder of wherever the Geyser config is located. Bedrock clients will automatically download and load those resource packs. There is currently no automatic Java-to-Bedrock resource pack conversion, but you can convert any Java resource pack to Bedrock using [this tool](https://rtm516.github.io/ConvertJavaTextureToBedrock/) and add that to your server. +You can add Bedrock resource packs to your Geyser installation in the `packs` folder of wherever the Geyser config is located. Bedrock clients will automatically download and load those resource packs. There is currently no automatic Java-to-Bedrock resource pack conversion, but you can convert any Java resource pack to Bedrock using [this tool](https://rtm516.github.io/ConvertJavaTextureToBedrock/) and add that to your server. The converter currently only works with packs up until 1.17; you will need to use another converter, or, [convert the pack yourself](https://learn.microsoft.com/en-us/minecraft/creator/documents/convertingtexturepacks). ## How can Bedrock players hold items in their offhand? @@ -77,7 +78,7 @@ Example: `/tp "."` There are three ways you can do this. The first way is to use Floodgate's built-in whitelist command, `/fwhitelist add `. The second way is to turn off the whitelist using `/whitelist off`, then get the Geyser player to join, then run `/whitelist add "."`, then turn the whitelist back on using `/whitelist on`. (If using this method for a Bedrock account linked to an existing, whitelisted Java account, there is no need to _also_ whitelist the Bedrock account; you may link the accounts then immediately turn the whitelist back on.) The third way is to add the player's UUID as given by Floodgate to the whitelist.json file and then run `/whitelist reload`. ## How do I find a player's UUID without them joining when using Floodgate? -Use [this page.](https://floodgate-uuid.heathmitchell1.repl.co/) If this doesn't work, then try this method: +Use [this page.](https://uuid.kejona.dev/) If this doesn't work, then try this method:

First, you'll need to get the XUID of the player. There are several third-party websites to find this, for example, [this one](https://cxkes.me/xbox/xuid) (unaffiliated with Geyser). Make sure to choose "Hexidecimal." You'll need to enter the player's Xbox Gamertag, and, once submitted, it should display the XUID in the format of `xxxxxxxxxxxxxxxx`. To turn the XUID into a UUID that Java Edition can recognize, you need to put the XUID in this format: `00000000-0000-0000-xxxx-xxxxxxxxxxxx`. If formatted right, Java Edition should accept it as a UUID. From 1cc2182a306270feddebf2daaa6ce2489bca976c Mon Sep 17 00:00:00 2001 From: netbela <112205549+netbela@users.noreply.github.com> Date: Sat, 18 Mar 2023 16:25:35 +0100 Subject: [PATCH 105/118] Adding of Netbela to the list of Hosting providers (#133) --- _data/providers.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/_data/providers.json b/_data/providers.json index 790854e..4ff59a4 100644 --- a/_data/providers.json +++ b/_data/providers.json @@ -268,6 +268,11 @@ "url": "https://minehub.de/", "description": "Get Geyser as a plugin. Use the same port as your Java server for the Bedrock port in your config and connect with that port, or buy a dedicated IP address to support a different port." }, + { + "name": "Netbela", + "url": "https://netbela.nl/store/minecraft", + "description": "Install Geyser as a plugin with the dedicated Plugin installer. Use the same port as your Java server in your config. Connect using the same address and port as your Java server." + }, { "name": "NFOservers", "url": "https://nfoservers.com/", From 618edf668dae3057330c3a5f18d1f87eb5da1250 Mon Sep 17 00:00:00 2001 From: Redned Date: Sun, 19 Mar 2023 15:44:01 -0500 Subject: [PATCH 106/118] Update build server links to new download API --- _data/navigation.yml | 8 ++------ _docs/floodgate/setup.md | 11 ++++------- _docs/geyser/setup.md | 4 ++-- _docs/geyser/standalone.md | 4 ++-- 4 files changed, 10 insertions(+), 17 deletions(-) diff --git a/_data/navigation.yml b/_data/navigation.yml index f7ed8a7..f5f2343 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -1,6 +1,2 @@ -- title: Geyser Download - external_url: https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/master/ -- title: Floodgate Download - external_url: https://ci.opencollab.dev/job/GeyserMC/job/Floodgate/job/master/ - - +- title: Download + external_url: https://geysermc.org/download \ No newline at end of file diff --git a/_docs/floodgate/setup.md b/_docs/floodgate/setup.md index 7539bf6..26fbee9 100644 --- a/_docs/floodgate/setup.md +++ b/_docs/floodgate/setup.md @@ -6,8 +6,7 @@ permalink: /floodgate/setup/ ## Downloads: -Floodgate: [https://ci.opencollab.dev/job/GeyserMC/job/Floodgate/job/master/](https://ci.opencollab.dev/job/GeyserMC/job/Floodgate/job/master/) -Geyser: [https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/master/](https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/master/) +Download Geyser and Floodgate from the [Geyser download page](https://geysermc.org/download). ## Prerequisites @@ -21,11 +20,9 @@ Geyser: [https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/master/](https:// For BungeeCord/Velocity setups: you only are required to install Floodgate on the BungeeCord or Velocity proxy unless you want to use the Floodgate API on the backend servers - see [below](#installing-floodgate-also-on-spigot-servers-behind-bungeecord-or-velocity) for the installation process.        *Note:* Installing Floodgate on the backend servers will allow Bedrock player skins to display without the Bedrock player having to switch backend servers. -- Download the Floodgate plugin from [here](https://ci.opencollab.dev/job/GeyserMC/job/Floodgate/job/master/) and add it to your plugins folder on your frontend server. - - `floodgate-spigot.jar` for Spigot, Paper, etc - - `floodgate-fabric.jar` for Fabric, can be downloaded [here](https://ci.opencollab.dev/job/GeyserMC/job/Floodgate-Fabric/job/master/). (Requires [FabricAPI](https://www.curseforge.com/minecraft/mc-mods/fabric-api)) - - `floodgate-bungee.jar` for BungeeCord, Waterfall, etc - - `floodgate-velocity.jar` for Velocity +- Download the Floodgate plugin and add it to your plugins folder on your frontend server. + - Select your platform on the download page linked above and click "Download Floodgate" + - If you are using Floodgate on Fabric, you will need to download the [Fabric API](https://www.curseforge.com/minecraft/mc-mods/fabric-api). - Change the `auth-type` in the Geyser config to `floodgate`. - Restart/start up the server. diff --git a/_docs/geyser/setup.md b/_docs/geyser/setup.md index db4cbab..3062187 100644 --- a/_docs/geyser/setup.md +++ b/_docs/geyser/setup.md @@ -33,7 +33,7 @@ The server itself does not have to be the latest version but does have to allow ## Plugin Setup 1. Read the Prerequisites above, especially if you are setting up Geyser for an older Minecraft Java Edition version! 2. To make sure you are using the easiest way to set up Geyser, please check whether your hosting provider features [built-in Geyser](/geyser/supported-hosting-providers/#built-in-geyser). If you are not using a hosting provider, or your hosting provider is not featured on said list, continue with the steps below. -3. If 2. does not apply: download a jar of Geyser from the [build server](https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/master/) depending on what platform your server runs on. See the [FAQ](/geyser/faq/#which-plugin-version-of-geyser-do-i-need) if you're confused about which build to download. Keep in mind: Geyser-Spigot.jar is for Spigot and its forks, such as PaperMC or Purpur. +3. If 2. does not apply: download Geyser [here](https://geysermc.org/download) for the platform your server runs on. See the [FAQ](/geyser/faq/#which-plugin-version-of-geyser-do-i-need) if you're confused about which build to download. 4. Put the Geyser jar file in your plugins folder and start up the server. 5. Port-forwarding: - If you are using a hosting provider, you will likely need to change your Bedrock port in `config.yml`. Information on your hosting provider might be available on the [Supported Hosting Providers](/geyser/supported-hosting-providers/) page. If there is no information on your hosting provider and you are unable to assign/open ports yourself, try enabling `clone-remote-port` in Geyser's `config.yml`file and connecting with the same IP/port as you would with Java Edition. @@ -62,7 +62,7 @@ The Bedrock clients, like Java clients, should connect to the proxy server, and #### Setup: 1. Make sure Velocity/BungeeCord is up-to-date. The proxy can be newer than the servers behind it (also called backend servers). If you're running the backend servers on an older version then the current {{ site.data.versions.java }}, you can use the plugin [ViaVersion](https://www.spigotmc.org/resources/19254/). It is recommended to have the plugin on all backend servers where necessary, instead to having it on the proxy. -2. Download a jar of Geyser from the [build server](https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/master/) depending on what platform your server runs on. See the [FAQ](/geyser/faq/#which-plugin-version-of-geyser-do-i-need) if you're confused about which build to download. +2. Download Geyser [here](https://geysermc.org/download) for the platform your server runs on. See the [FAQ](/geyser/faq/#which-plugin-version-of-geyser-do-i-need) if you're confused about which build to download. 3. Put the Geyser jar file in your plugins folder and start up the server. 4. Port-forwarding: - If you are using a hosting provider, you will likely need to change your Bedrock port in the `config.yml` file. Information on your hosting provider might be available on the [Supported Hosting Providers](/geyser/supported-hosting-providers/) page. If your hosting provider is not listed there, and you are unable to port forward the default 19132 port on UDP, try setting `clone-remote-port` to true and connecting with the Java IP and port. Any port will work, as long as the UDP protocol is not blocked or already in use by the query feature (see `server.properties`) or another mod. diff --git a/_docs/geyser/standalone.md b/_docs/geyser/standalone.md index 276c3b6..4c382b5 100644 --- a/_docs/geyser/standalone.md +++ b/_docs/geyser/standalone.md @@ -21,7 +21,7 @@ The server itself does not have to be the latest version but does have to allow ## Standalone Setup Please keep in mind, you need some sort of computer or host to run Geyser Standalone on. Applications such as Termux on Android are capable of running Geyser, but this largely depends on how powerful your Android device is. Please do so at your own risk. Instructions to run Geyser on Termux can be found [here](/geyser/setup/#termux-android). -1. Download a jar of Geyser from the [build server](https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/master/). +1. Download [Geyser Standalone](https://download.geysermc.org/v2/projects/geyser/versions/latest/builds/latest/downloads/standalone). 2. Create a new folder for Geyser, and drop the jar in there. ### GUI Setup (Recommended) @@ -67,7 +67,7 @@ curl https://gist.githubusercontent.com/rtm516/e3e07d6595ee41e05a38b03c0f4d7a80/ 2. Install [NewTerm 2](https://chariz.com/get/newterm). 4. Download PojavLauncher's Java 16 JRE for iOS and install it using Filza [here](https://github.com/PojavLauncherTeam/PojavLauncher_iOS/releases/download/v16-openjdk/openjdk-16-jre_16.0.0+git20201217.8383f41-2_iphoneos-arm.deb). 3. Download this package containing modified java commands, and install it using Filza [here](https://cdn.discordapp.com/attachments/558829512633090048/834014323755319306/com.letschill.java_0.1_iphoneos-arm.deb) (Note: Not an official GeyserMC project, install at your own risk). -4. Open NewTerm 2 and run `wget https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/master/lastSuccessfulBuild/artifact/bootstrap/standalone/build/libs/Geyser-Standalone.jar` +4. Open NewTerm 2 and run `wget https://download.geysermc.org/v2/projects/geyser/versions/latest/builds/latest/downloads/standalone` 5. Run `java -jar Geyser-Standalone.jar`. 6. Geyser should show up in the Friends tab inside Minecraft. From 32fc1e8eeed604a70193166f21b0fc4456105d5c Mon Sep 17 00:00:00 2001 From: Platform <121612871+platform-minefortcom@users.noreply.github.com> Date: Mon, 20 Mar 2023 14:18:28 +0100 Subject: [PATCH 107/118] Add Minefort to the list of hosting providers (#134) --- _data/providers.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/_data/providers.json b/_data/providers.json index 4ff59a4..1180252 100644 --- a/_data/providers.json +++ b/_data/providers.json @@ -48,6 +48,11 @@ "url": "https://mcprohosting.com/", "description": "Click \"Enable Bedrock Support\" on the server dashboard and follow the steps. For manual installation: Add Destination Port 19132 with Protocol UDP to the port forward mapping and connect to the given source port." }, + { + "name": "Minefort", + "url": "https://minefort.com/", + "description": "On the server dashboard under \"Connect Support\", make sure \"Allow Bedrock\" is enabled. Then simply connect via `play.minefort.com` and join using `/server `, or connect via `.minefort.com`." + }, { "name": "Minehut", "url": "https://minehut.com/", From ad843c10b4c8d9bc4db517cdba1007ed982500d8 Mon Sep 17 00:00:00 2001 From: Jens Co <63231928+Jens-Co@users.noreply.github.com> Date: Thu, 30 Mar 2023 17:53:15 +0200 Subject: [PATCH 108/118] Update fixing-unable-to-connect-to-world.md (#136) --- _docs/geyser/fixing-unable-to-connect-to-world.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_docs/geyser/fixing-unable-to-connect-to-world.md b/_docs/geyser/fixing-unable-to-connect-to-world.md index b16d65b..c7d64c9 100644 --- a/_docs/geyser/fixing-unable-to-connect-to-world.md +++ b/_docs/geyser/fixing-unable-to-connect-to-world.md @@ -99,9 +99,9 @@ Minecraft offers a vanilla Bedrock server [here](https://www.minecraft.net/en-us # Using Geyser on the same computer -## Windows 10 +## Windows 10/11 -_This only affects people trying to join Geyser from Windows 10 Edition with Geyser hosted on the same computer._ +_This only affects people trying to join Geyser from Windows 10/11 Edition with Geyser hosted on the same computer._ This is an issue caused by Loopback restrictions not being lifted. By default, Microsoft Apps have this restriction on all their apps for local connections. Geyser will attempt to resolve this automatically; however, if you're still having connection problems, you can lift it by typing the following in Windows PowerShell in administrator mode: (it should return `OK.` if it worked) ```powershell From 92b73871f0f415290fd8cb88fa46f1934c60fcd8 Mon Sep 17 00:00:00 2001 From: Tydium <67938521+Tydium@users.noreply.github.com> Date: Mon, 3 Apr 2023 23:11:14 -0400 Subject: [PATCH 109/118] Update Default Tydium Skin API Link + Minor Change (#137) Considering TC doesn't have a server anymore, I have dedicated the main site to the API. Therefore "/" is now the main docs home page. I also removed the other two creators since they have both faded off the planet of earth + they don't even work with me on the project. (The main Skin API page is officially back up for anyone wondering.) --- _docs/other/community-geyser-projects.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_docs/other/community-geyser-projects.md b/_docs/other/community-geyser-projects.md index b00ab65..0679b2b 100644 --- a/_docs/other/community-geyser-projects.md +++ b/_docs/other/community-geyser-projects.md @@ -126,6 +126,6 @@ Creator: [Vincss](https://github.com/vincss) ## TydiumCraft Skin API An API makes it easier for your Bedrock skin to be rendered and outputted! -* [Website](https://tydiumcraft.net/docs/skinapi) +* [Website](https://tydiumcraft.net/) -Creators: [Tydium](https://github.com/Tydium), [higbead](https://github.com/higbead), [gibbon27](https://github.com/gibbon27) +Creators: [Tydium](https://github.com/Tydium) From a2ed0ce7a68b196bed12577039df83835ebbbba7 Mon Sep 17 00:00:00 2001 From: Brian Date: Fri, 7 Apr 2023 16:33:19 -0700 Subject: [PATCH 110/118] Update community-geyser-projects.md (#139) Update name of GeyserHacks to Hurricane. --- _docs/other/community-geyser-projects.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/_docs/other/community-geyser-projects.md b/_docs/other/community-geyser-projects.md index 0679b2b..f8d7abb 100644 --- a/_docs/other/community-geyser-projects.md +++ b/_docs/other/community-geyser-projects.md @@ -84,12 +84,6 @@ Plugin that blocks Java players from joining your Geyser server, so you can have Creator: [Camotoy](https://github.com/Camotoy) -## GeyserHacks -Various workarounds for Geyser players that modify the server in order to achieve their goal. -* [GitHub](https://github.com/Camotoy/GeyserHacks) - -Creator: [Camotoy](https://github.com/Camotoy) - ## GeyserPlaceholders Placeholders support for Geyser. @@ -118,6 +112,12 @@ This is a Spigot/BungeeCord/Velocity plugin that can be used to automatically up Creators: [Jens](https://github.com/Jens-Co), [YHDiamond](https://github.com/YHDiamond), [Konicai](https://github.com/Konicai) +## Hurricane +Various workarounds for Geyser players that modify the server in order to achieve their goal. +* [GitHub](https://github.com/GeyserMC/Hurricane) + +Creator: [Camotoy](https://github.com/Camotoy) + ## SleepingServerStarter Small application that waits for a player to connect before launching actual minecraft server. * [GitHub](https://github.com/vincss/mcsleepingserverstarter) From dd9b8338eb7fde3c1949e0f035a26556e25a81f2 Mon Sep 17 00:00:00 2001 From: onebeastchris Date: Thu, 20 Apr 2023 18:46:02 +0200 Subject: [PATCH 111/118] let us not forget floodgate-fabric (#138) * LETS NOT FORGET FLOODGATE-FABRIC let us not forget floodgate-fabric * chew is great Co-authored-by: Olivia --------- Co-authored-by: Olivia --- _docs/floodgate/root.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_docs/floodgate/root.md b/_docs/floodgate/root.md index c2a8cd2..63e6c32 100644 --- a/_docs/floodgate/root.md +++ b/_docs/floodgate/root.md @@ -7,7 +7,7 @@ permalink: /floodgate/ # Floodgate ## What is Floodgate? Floodgate is a hybrid mode plugin that allows Minecraft: Bedrock Accounts to join Minecraft: Java Edition servers without needing a Minecraft: Java Edition account. -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, and Velocity, and can only be utilized on servers that have it installed. +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? 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), From 7f0ebc257b42d2a97a25762243009d804243f038 Mon Sep 17 00:00:00 2001 From: onebeastchris Date: Thu, 20 Apr 2023 18:46:17 +0200 Subject: [PATCH 112/118] let us not forget floodgate-fabric (#138) * LETS NOT FORGET FLOODGATE-FABRIC let us not forget floodgate-fabric * chew is great Co-authored-by: Olivia --------- Co-authored-by: Olivia From 3bea229026785d09d291ba3af4c71c66647e7fd8 Mon Sep 17 00:00:00 2001 From: JackOXI <53652452+JackW6809@users.noreply.github.com> Date: Sat, 22 Apr 2023 17:11:58 +0100 Subject: [PATCH 113/118] Update linking.md (#140) Update the URL for the default configuration file. --- _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 b54c839..7adf12f 100644 --- a/_docs/floodgate/linking.md +++ b/_docs/floodgate/linking.md @@ -32,7 +32,7 @@ player-link: # accounts, allowing people to link once, join everywhere (on servers with global linking). use-global-linking: true ``` -([see the default config](https://github.com/GeyserMC/Floodgate/blob/master/common/src/main/resources/config.yml)) +([see the default config](https://github.com/GeyserMC/Floodgate/blob/master/core/src/main/resources/config.yml)) Once you saved the config and restarted your server you should be using Global Linking. From 4a65973b07f566b5be28eb6014f94aafb00a74e9 Mon Sep 17 00:00:00 2001 From: CrystalVortex <99749845+CrystalVortex@users.noreply.github.com> Date: Wed, 26 Apr 2023 19:41:54 +0200 Subject: [PATCH 114/118] Update forms.md (#141) --- _docs/floodgate/forms.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_docs/floodgate/forms.md b/_docs/floodgate/forms.md index 05b4d0b..ccc9471 100644 --- a/_docs/floodgate/forms.md +++ b/_docs/floodgate/forms.md @@ -91,8 +91,8 @@ FloodgatePlayer player = FloodgateApi.getInstance().getPlayer(uuid); player.sendForm( CustomForm.builder() .title("My cool title") - .content("10/10 content") -)); + .label("10/10 content") +); ``` ## Receiving a response from the client From 7f3ec0c1e8cd78dcd98071cbb4d0d8000b91262f Mon Sep 17 00:00:00 2001 From: onebeastchris Date: Fri, 28 Apr 2023 13:36:59 +0200 Subject: [PATCH 115/118] Update playit-gg.md (#144) adapt to new playit.gg site --- _docs/geyser/playit-gg.md | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/_docs/geyser/playit-gg.md b/_docs/geyser/playit-gg.md index 8a2793e..8fde73f 100644 --- a/_docs/geyser/playit-gg.md +++ b/_docs/geyser/playit-gg.md @@ -7,23 +7,25 @@ permalink: /geyser/playit-gg/ ## Prerequisites - You must be able to connect to your Geyser instance locally. +- 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. ## Setup -1. Head over to [playit.gg's website](https://playit.gg/). -2. Select the "Minecraft Bedrock" option. - ![img](https://cdn.discordapp.com/attachments/744287608217272351/954912170838224908/unknown.png) -3. Select "Yes" for the next 2 questions. It'll then prompt you to download the playit.gg program. Make sure to download the correct one for your system, then run it. - ![img](https://cdn.discordapp.com/attachments/744287608217272351/955133727602802748/unknown.png) -4. Create a playit.gg account (Alternatively, you can select the guest button if you are trying it out). - ![img](https://cdn.discordapp.com/attachments/744287608217272351/955135576045137971/unknown.png) -5. Connect to your tunnel using the provided playit.gg address. - ![img](https://cdn.discordapp.com/attachments/744287608217272351/955138885388730428/unknown.png) -6. If you join successfully, then you are done! Make sure to leave the playit.gg program running as closing it will close the tunnel. (If you failed to join, check out the [troubleshooting](/geyser/setting-up-playit-gg/#troubleshooting) section of the page.) +1. Head over to [playit.gg's website](https://playit.gg/) - download the program & run it. It will open the login site in the browser - create an account & sign in. Or, use a guest account. +2. Once logged in, make sure to connect the program + site, until step 4 is reached. This should happen automatically, if it does not, follow the instructions on the website and the playit.gg program console. + ![img](https://cdn.discordapp.com/attachments/613194762249437245/1101302643214794863/image.png) +3. Click "Create Tunnel" if you see the screen above, or, select the "Tunnels" tab when logged in to your account. There, select "Minecraft Bedrock", leave "Enable Tunnel" ticked, and click "Add tunnel". + ![img](https://cdn.discordapp.com/attachments/613194762249437245/1101305135768027156/image.png) +4. Once "Add tunnel" is clicked, it should create a new tunnel, and you are set! Scroll down until you see this: + ![img](https://cdn.discordapp.com/attachments/613194762249437245/1101306419640270858/image.png) + If you have Geyser running on a port that is not 19132, update the port there. The "Local Address" does not need to be changed unless you are not running playit.gg and Geyser on the same device. +5. Connect to your server - use the IP and Port from the "Allocation" tab. In our example - "180.ip.ply.gg" as the IP, and "17019" as the port. Alternatively, use the Domain it gives you instead of the IP. +6. If you join successfully, then you are done! Make sure to leave the playit.gg program running as closing it will close the tunnel. You also may want to ratelimit individual connections - use the "Per Connection Rate Limit" option to do so. + (If you failed to join, check out the [troubleshooting](/geyser/setting-up-playit-gg/#troubleshooting) section of the page.) ## Troubleshooting ### I can't connect to my server! +* *Are there errors in your minecraft server console?* * *Make sure to check [here](/geyser/fixing-unable-to-connect-to-world/) beforehand.* -* *If you changed the port that Geyser would bind to, you'll have to tell playit.gg to use that port instead in the image below.* - ![img](https://cdn.discordapp.com/attachments/614877230811709474/955162113138102404/unknown.png) +* *If you changed the port that Geyser would bind to, you'll have to tell playit.gg to use that port instead! See step 5 here.* * *(Alternatively: You can try setting the* `bedrock` `port` *in the Geyser configuration to* `19132`.) From 603935870321ec32b2a62aa462e29a7ffa943ed7 Mon Sep 17 00:00:00 2001 From: 404invalid-user Date: Fri, 28 Apr 2023 12:39:00 +0100 Subject: [PATCH 116/118] Added Snakecraft Hosting to supported providers (#142) * Added Snakecraft Hosting to supported providers * Fixed mistake moved snakecrafthosting to built_in fixed my mistake by putting Snakecraft Hosting in support not built_in also changed the description --- _data/providers.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/_data/providers.json b/_data/providers.json index 1180252..d05e876 100644 --- a/_data/providers.json +++ b/_data/providers.json @@ -83,6 +83,11 @@ "url": "https://server.pro", "description": "On VPS, select Geyser in the [Service Type Menu](https://i.imgur.com/loSNmvu.png), Floodgate can be enabled and disabled on the dashboard configuration. For manual installation: If using a Premium or Free plan, use the same port as your Java server for the Bedrock port in the configuration file and connect with the same port; for the Free plan, also enable the `clone-remote-port` option; leave the IP values as default (`0.0.0.0` and `auto`). However, if you are using a PRO or a VPS plan, you can use any port you'd like, which can be opened on the Firewall tab." }, + { + "name": "Snakecraft Hosting", + "url": "https://snakecrafthosting.com/", + "description": "Select \"Paper + Geyser with Floodgate\" under the Jar Type at checkout to install the Geyser plugin. Players will Connect with the same IP and port as you would on Java." + }, { "name": "SRKHOST", "url": "https://www.srkhost.eu/", From 4d4c7a1866faa8a4830000225014221c89b4fda2 Mon Sep 17 00:00:00 2001 From: onebeastchris Date: Fri, 28 Apr 2023 13:39:27 +0200 Subject: [PATCH 117/118] Update versions (#143) Drop 1.19.40, add 1.19.80 --- _data/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/versions.json b/_data/versions.json index 584f560..2afa034 100644 --- a/_data/versions.json +++ b/_data/versions.json @@ -1,4 +1,4 @@ { - "bedrock": "1.19.30 - 1.19.70", + "bedrock": "1.19.40 - 1.19.80", "java": "1.19.4" } From 290d54d99ad340238386a6deb1c8c0ffab47496d Mon Sep 17 00:00:00 2001 From: Hasan <52300558+hasankayra04@users.noreply.github.com> Date: Sat, 13 May 2023 22:05:31 +0300 Subject: [PATCH 118/118] Update mc-host24.de in providers (#149) * [Needs conformation] mc-host24.de Looks like mc-host24.de needs you to set your Bedrock address to your server ip. * Fixed ',' mistake * Requested changes * Thanks Chris --- _data/providers.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/providers.json b/_data/providers.json index d05e876..6e7468d 100644 --- a/_data/providers.json +++ b/_data/providers.json @@ -256,7 +256,7 @@ { "name": "MC-HOST24.de", "url": "https://mc-host24.de/", - "description_template": "default" + "description": "Get Geyser as a plugin. Use the same port as your Java server for the Bedrock port in your config (either by setting it yourself, or enabling \"clone-remote-port\"). Set remote address to auto, and bedrock address to the server IP. Connect with the Java IP and port." }, { "name": "Meloncube",