Skip to content

Commit

Permalink
Merge remote-tracking branch 'wiki/master'
Browse files Browse the repository at this point in the history
Signed-off-by: Joshua Castle <[email protected]>
  • Loading branch information
Kas-tle committed Jul 14, 2024
2 parents a5cd453 + e92be39 commit 4d2f144
Show file tree
Hide file tree
Showing 9 changed files with 46 additions and 52 deletions.
2 changes: 1 addition & 1 deletion docs/floodgate/faq.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Here you can find answers to frequently asked questions about Floodgate - if you
<Q>
How do I obtain the UUIDs of Bedrock players?
<A>
Check your server logs, or use [this](https://uuid.kejona.dev/) page. If this doesn't work, then try this method:
Check your server logs, or use [this](https://mcprofile.io/) 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](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.
</A>
Expand Down
32 changes: 12 additions & 20 deletions docs/geyser/anticheat-compatibility.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,21 @@ This is a community-compiled list and does not indicate any endorsement from Gey

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 15th Jun 2022
- [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
- [Spartan: Bedrock Edition](https://builtbybit.com/resources/12832/) (Paid) - Last Updated on 22nd May 2023
- [AntiAura](https://www.spigotmc.org/resources/1368/) (Paid) - Last checked on 24th January 2023
- [Themis](https://www.spigotmc.org/resources/90766/) - Last checked on 1st January 2024
- [Spartan: Bedrock Edition](https://builtbybit.com/resources/12832/) (Paid) - Last checked on 4th June 2024

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
- [Intave](https://intave.ac) (Paid) Requires [GeyserMC addon](https://github.com/intave/bedrock) - Last Updated on 24th October 2022
- [Matrix](https://matrix.rip/) (Paid) - Last updated on 2nd September 2021
- [Spartan: Java Edition](https://www.spigotmc.org/resources/25638/) (Paid) - Last Updated on 22nd May 2023
- [Vulcan](https://www.spigotmc.org/resources/83626/) (Paid) - Last Updated on 19th August 2021
- [Verus](https://verus.ac) (Paid) - Last Updated on 13th July 2022
- [GrimAC](https://github.com/MWHunter/Grim) - Last checked on 23rd May 2024
- [Intave](https://intave.ac) (Paid) Requires [GeyserMC addon](https://github.com/intave/bedrock) - Last checked on 24st May 2024
- [Matrix](https://matrix.rip/) (Paid) - Last checked on 6th June 2024
- [Spartan: Java Edition](https://www.spigotmc.org/resources/25638/) (Paid) - Last checked on 4th June 2024
- [Vulcan](https://www.spigotmc.org/resources/83626/) (Paid) - Last checked on 3rd June 2024
- [Verus](https://verus.ac) (Paid) - Last checked on 10th September 2023

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
- [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 checked on 12th May 2024
- [GodsEye](https://www.spigotmc.org/resources/69595/) ([GodsEyeGeyserMC](https://github.com/TheDejavu/GodsEyeGeyserMC/releases) is an addon that enables Partial Compatibility) (Paid) - Last checked on 23rd March 2024
- [Wraith](https://www.spigotmc.org/resources/66887/) (Paid) - Last checked on 26th January 2023
2 changes: 1 addition & 1 deletion docs/geyser/current-limitations.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ The following things cannot be fixed without changes to Bedrock or the Java prot
- Dolphin's Grace potion effect visuals (effects should still work correctly)
- Invisible item frames
- Blocks (excluding jack-o-lantern) on entity heads (E.G. armor stands, players)
Some block state changes are controlled client side, and are not influenced by the debug stick - fences for example. (https://github.com/GeyserMC/Geyser/issues/3125)
- Some block state changes are controlled client side, and are not influenced by the debug stick - fences for example. (https://github.com/GeyserMC/Geyser/issues/3125)
- Custom beacon base blocks (https://github.com/GeyserMC/Geyser/issues/2301) - these are hardcoded on Bedrock edition.
- Climbable blocks changed by datapacks (https://github.com/GeyserMC/Geyser/issues/4051)
- Custom enchantments/sweeping edge (https://github.com/GeyserMC/Geyser/issues/3121)
Expand Down
2 changes: 1 addition & 1 deletion docs/geyser/events.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,4 @@ To (optionally) set the priority of your event listener, you can add the priorit
@Subscribe(postOrder = PostOrder.EARLY)
```
If you do not specify a priority, the default priority is used. For all available priorities, see
[here](https://github.com/GeyserMC/Events/blob/master/src/main/java/org/geysermc/event/PostOrder.java).
[here](https://github.com/GeyserMC/Events/blob/master/src/main/java/org/geysermc/event/PostOrder.java).
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ Disabling Geyser warnings from being logged will not fix the real issue! Only di
Setting "command-suggestions" to false in the config will also disable this.
- `-DGeyser.RakPacketLimit=120`
- Sets RakNet's per-ip per-tick (10ms) post-connection packet limit.
- `-DGeyser.RakOfflinePacketLimit=10`
- Sets RakNet's per-ip per-second pre-connection packet limit.
- `-DGeyser.RakGlobalPacketLimit=100000`
- Sets RakNet's per-tick (10ms) overall packet limit.
- `-DGeyser.RakRateLimitingDisabled=true`
Expand Down
2 changes: 1 addition & 1 deletion docs/other/community-geyser-projects.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ Plugin that blocks Java players from joining your Geyser server, so you can have

Creator: [Camotoy](https://github.com/Camotoy)

## GeyserExtras
## GeyserExtras {#geyserextras}
A Spigot plugin which attempts to unify features for Bedrock Edition players, including features like a cleaner looking combat cooldown, combat sounds and other helpful features and workarounds.

* [Modrinth](https://modrinth.com/plugin/geyserextras)
Expand Down
36 changes: 16 additions & 20 deletions docs/other/developer-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,59 +12,55 @@ description: A guide for developers who want to contribute to GeyserMC projects.
# Project layout {#project-layout}

Geyser's code is divided into different modules. For example:

* `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.
`core` is where connections are handled and the data/packet conversion is done. The majority of Geyser work is held here.
* `core` is where connections are handled and the data/packet conversion is done. The majority of Geyser work is held here.
* `api` is where the Geyser API is found.
* `build-logic` is where the Kotlin Gradle plugins used to build Geyser are.

# Compiler/IDE Tools

### Minecraft Development (IntelliJ IDEA plugin) {#minecraft-development}
The [Minecraft Development](https://github.com/minecraft-dev/MinecraftDev) IntelliJ IDEA plugin is an awesome tool that can
be very helpful when working on Geyser. It allows you to view `.nbt` files, easily link mixins to the source they modify, and much
more. While not strictly needed, it is definitely recommended.
# Compiler/IDE Tools {#compiler-ide-tools}

### Lombok {#lombok}
## Lombok {#lombok}

*Note that the latest version of IntelliJ IDEA does not require additional setup in order to develop with Geyser.*

If you're using an IDE for editing any of the GeyserMC projects you will most likely need to install the Project Lombok plugin as it is used to generate a bunch of handy functions.
You can edit without it but you may get missing functions and or other issues displayed in your IDE. Please see the IDE section on their site for the supported plugins and install methods [https://projectlombok.org/setup/overview](https://projectlombok.org/setup/overview).

# Protocol Information
# Protocol Information {#protocol-information}

### GopherTunnel {#gophertunnel}
## GopherTunnel {#gophertunnel}
[GopherTunnel](https://github.com/Sandertv/gophertunnel/tree/master/minecraft/protocol/packet) is a library for Bedrock Edition written in Go. The source code is an excellent documentation for the Bedrock protocol.

### wiki.vg {#wikivg}
## wiki.vg {#wikivg}
For a full rundown of the Java Edition protocol, see [here](https://wiki.vg/Protocol).

### wiki.vg (Bedrock) {#wikivg-bedrock}
## wiki.vg (Bedrock) {#wikivg-bedrock}
The Bedrock Edition protocol is documented [here](https://wiki.vg/Bedrock_Protocol), but it's currently incomplete so only use it as a reference.

# Programs
# Programs {#programs}

### debuginfo-be {#debuginfo-be}
## debuginfo-be {#debuginfo-be}
[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}
## pakkit {#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://github.com/Heath123/pakkit/releases/). It's currently WIP, so expect bugs.

### Gadget {#gadget}
## Gadget {#gadget}
Gadget is a fabric client mod to inspect & log, amongst other things, packets sent between a java server and a java client. It can be useful to determine java behavior.
You can download it from [here](https://modrinth.com/mod/gadget).

### ProxyPass {#proxypass}
## ProxyPass {#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/CloudburstMC/ProxyPass) and the vanilla Bedrock server can be found [here](https://www.minecraft.net/download/server/bedrock/).
There is a ProxyPass fork that supports online-mode (allowing you to join Geyser servers and see sent packets): [Kastle's proxypass fork](https://github.com/Kas-tle/ProxyPass/).

### MCC Toolchest {#mcc-toolchest}
## MCC Toolchest {#mcc-toolchest}
MCC Toolchest is a tool for viewing and editing NBT data for Bedrock edition, this allows you to see data as it is stored in Bedrock. You can download it from [here](https://mcctoolchest.weebly.com/).

### NBTExplorer {#nbtexplorer}
## NBTExplorer {#nbtexplorer}
NBTExplorer is a tool for viewing and editing NBT data for Java edition, this allows you to see data as it is stored in Java edition. You can download it from [here](https://github.com/jaquadro/NBTExplorer/releases).

### Windows 10 Multi-Version Launcher {#windows-10-multi-version-launcher}
## Windows 10 Multi-Version Launcher {#windows-10-multi-version-launcher}
The Windows 10 Multi-Version launcher allows you to switch between release and beta versions of Minecraft Bedrock. Its GitHub repository can be viewed [here](https://github.com/MCMrARM/mc-w10-version-launcher/).
Alternatively, use FoxyNoTail's Version Switcher, found [here](https://foxynotail.com/software/mcbe-switcher).
Note: To apply the [loopback fix](/geyser/fixing-unable-to-connect-to-world#windows-1011) for Minecraft Preview, use the following loopback restriction lifting command with the different app ID: `CheckNetIsolation LoopbackExempt -a -n="Microsoft.MinecraftWindowsBeta_8wekyb3d8bbwe"`
18 changes: 13 additions & 5 deletions src/data/providers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ export const providersData: Providers = {
message: "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: 'Arth Hosting',
url: 'https://arthmc.xyz/',
description: "Geyser is installed and configured on all servers by default. You can disable it in the 'Manage Plugins' menu."
},
{
name: 'Aternos',
url: 'https://aternos.org/',
Expand All @@ -38,11 +43,6 @@ export const providersData: Providers = {
message: "Install Geyser 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. 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: 'Arth Hosting',
url: 'https://arthmc.xyz/',
description: "Geyser is installed and configured on all servers by default. You can disable it in the 'Manage Plugins' menu."
},
{
name: 'Cloud Nord',
url: 'https://cloudnord.net/',
Expand Down Expand Up @@ -117,6 +117,14 @@ export const providersData: Providers = {
url: 'https://physgun.com/',
description: descriptionTemplates.default
},
{
name: 'PiglinHost',
url: 'https://piglinhost.com/',
description: translate({
id: 'providers.provider.piglinhost.description',
message: "Order from the [cross-platform servers page](https://piglinhost.com/minecraft-java-hosting.html). Alternatively, contact their support by creating a [support ticket](https://billing.piglinhost.com/submitticket.php?step=2&deptid=5) or via discord for installation and configuration help."
})
},
{
name: 'OMGServ',
url: 'https://www.omgserv.com/en/',
Expand Down
2 changes: 1 addition & 1 deletion src/data/versions.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"bedrock": "1.20.80-1.21.0",
"bedrock": "1.20.80-1.21.2",
"java": "1.20.5/1.20.6"
}

0 comments on commit 4d2f144

Please sign in to comment.