diff --git a/src/data/versions.json b/src/data/versions.json index 42fa6be..454aa56 100644 --- a/src/data/versions.json +++ b/src/data/versions.json @@ -1,12 +1,12 @@ { "bedrock": { - "supported": "1.20.80-1.21.20", + "supported": "1.20.80-1.21.23", "latest": { "id": 712, "name": "1.21.20" } }, "java": { - "supported": "1.21" + "supported": "1.21/1.21.1" } } diff --git a/src/pages/download/index.tsx b/src/pages/download/index.tsx index 59fef58..a837121 100644 --- a/src/pages/download/index.tsx +++ b/src/pages/download/index.tsx @@ -53,32 +53,22 @@ const DownloadPage: React.FC = () => ( spigot: , velocity: , fabric: , + neoforge: }} additionalDownloads={{ fabric: { url: "https://modrinth.com/mod/floodgate", file: "floodgate-fabric.jar" + }, + neoforge: { + url: "https://modrinth.com/mod/floodgate", + file: "floodgate-neoforge.jar" } }} /> - A plugin to allow for Geyser players to connect to your server without needing to use a proxy.} - id='geyserconnect' - inner={ - GeyserConnect, - }} - gridColumns={1} - /> - } - /> An optional Bedrock resource pack to extend Geyser functionality.} @@ -94,7 +84,7 @@ const DownloadPage: React.FC = () => ( /> } /> - An extension that adds support for loading ears and other third party cosmetics on java players} id='thirdpartycosmetics' @@ -109,6 +99,36 @@ const DownloadPage: React.FC = () => ( /> } /> + A plugin with various workarounds for Geyser players that modify the server in order to achieve their goal.} + id='hurricane' + inner={ + , + }} + gridColumns={1} + /> + } + /> + A Geyser extension allowing players to connect to different Java or Geyser servers.} + id='geyserconnect' + inner={ + GeyserConnect, + }} + gridColumns={1} + /> + } + /> A companion mod to Geyser which allows for Bedrock players to join modded Minecraft: Java Edition servers.} @@ -126,21 +146,6 @@ const DownloadPage: React.FC = () => ( /> } /> - Various workarounds for Geyser players that modify the server in order to achieve their goal.} - id='hurricane' - inner={ - , - }} - gridColumns={1} - /> - } - /> diff --git a/wiki/floodgate/faq.mdx b/wiki/floodgate/faq.mdx index de890c6..a1e6565 100644 --- a/wiki/floodgate/faq.mdx +++ b/wiki/floodgate/faq.mdx @@ -27,7 +27,7 @@ Here you can find answers to frequently asked questions about Floodgate - if you - How do I get placeholders from PlaceolderAPI for Bedrock players? + How do I get placeholders from PlaceholderAPI for Bedrock players? 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. diff --git a/wiki/floodgate/linking.md b/wiki/floodgate/linking.md index 20ff222..b97720c 100644 --- a/wiki/floodgate/linking.md +++ b/wiki/floodgate/linking.md @@ -43,7 +43,7 @@ You can also set up a local linking database on your server. Local linking can w Note that you only have to follow these steps on your proxy (BungeeCord or Velocity), if you have one. -1. Download one of the linking databases extensions [here](https://ci.opencollab.dev/job/GeyserMC/job/Floodgate/job/old%252F2.1/). +1. Download one of the linking databases extensions [here](https://ci.opencollab.dev/job/GeyserMC/job/Floodgate/job/fix-weird-via-issue/). 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. diff --git a/wiki/floodgate/setup.mdx b/wiki/floodgate/setup.mdx index b8781b5..869ae6f 100644 --- a/wiki/floodgate/setup.mdx +++ b/wiki/floodgate/setup.mdx @@ -7,14 +7,14 @@ description: Set up Floodgate to allow Bedrock users to authenticate with their import Tabs from "@theme/Tabs"; import TabItem from "@theme/TabItem"; -import Fabric from './setup/fabric.mdx'; +import ModdedServers from './setup/modded.mdx'; import ProxyServers from './setup/proxy-servers.mdx'; import PaperSpigot from './setup/paper-spigot.mdx'; import ViaProxy from './setup/viaproxy.mdx'; import Standalone from './setup/standalone.mdx'; import PlatformIcon from '@site/src/components/PlatformIcon' -import FabricIcon from '@site/static/img/icons/fabric.png'; +import ModIcon from '@site/static/img/icons/fabric.png'; import ProxyServersIcon from '@site/static/img/icons/velocity.png'; import PaperSpigotIcon from '@site/static/img/icons/paper.png'; import ViaProxyIcon from '@site/static/img/icons/viaproxy.png'; @@ -24,8 +24,8 @@ import StandaloneIcon from '@site/static/img/icons/geyser.png'; } default> - }> - + }> + }> diff --git a/wiki/floodgate/setup/fabric.mdx b/wiki/floodgate/setup/fabric.mdx deleted file mode 100644 index cbd1778..0000000 --- a/wiki/floodgate/setup/fabric.mdx +++ /dev/null @@ -1,15 +0,0 @@ ---- -title: Floodgate Fabric Setup -description: Learn how to set up Floodgate on your Fabric server. -hide_title: true ---- - -1. Download Floodgate-Fabric from the [modrinth page](https://modrinth.com/mod/floodgate). -2. Place the Floodgate-Fabric.jar in the `mods` folder, and restart the server. **You also need [FabricAPI](https://modrinth.com/mod/fabric-api) installed.** -3. Change `auth-type` in Geyser's config to `floodgate`. -4. Restart the server. - - -:::note Note for Fabric behind a Velocity proxy -You will need to configure FabricProxyLite to allow the Fabric server to receive data from Velocity. -::: \ No newline at end of file diff --git a/wiki/floodgate/setup/modded.mdx b/wiki/floodgate/setup/modded.mdx new file mode 100644 index 0000000..364b40e --- /dev/null +++ b/wiki/floodgate/setup/modded.mdx @@ -0,0 +1,15 @@ +--- +title: Modded Fabric Setup +description: Learn how to set up Floodgate on your Fabric / NeoForge server. +hide_title: true +--- + +1. Download the mod from the [modrinth page](https://modrinth.com/mod/floodgate). **Fabric servers also need the [FabricAPI](https://modrinth.com/mod/fabric-api) mod.** +2. Place the mod jar in the `mods` folder, and restart the server. +3. Change `auth-type` in Geyser's config to `floodgate`. +4. Restart the server. + + +:::note Note for Fabric servers running behind a Velocity proxy +You will need to configure FabricProxyLite to allow the Fabric server to receive data from Velocity. +::: \ No newline at end of file diff --git a/wiki/geyser/api.md b/wiki/geyser/api.md index 18f5e33..011e032 100644 --- a/wiki/geyser/api.md +++ b/wiki/geyser/api.md @@ -22,7 +22,7 @@ It can be used easily in Geyser Extensions, see [here](/wiki/geyser/extensions) **Quick overview:** :::info - Note: To see full, detailed documentation, see the javadocs. + Javadocs can be found here. ::: #### [GeyserApi](https://github.com/GeyserMC/Geyser/blob/master/api/src/main/java/org/geysermc/geyser/api/GeyserApi.java): {#geyserapi} diff --git a/wiki/geyser/current-limitations.md b/wiki/geyser/current-limitations.md index d742fa8..cd7f4ef 100644 --- a/wiki/geyser/current-limitations.md +++ b/wiki/geyser/current-limitations.md @@ -12,22 +12,20 @@ Despite Minecraft Bedrock and Java being quite close in comparison, there are so The following things cannot be fixed without changes to Bedrock or the Java protocol in general. As of now, they are not fixable in Geyser. -- Custom heads in inventories - Clickable links in chat - Glowing effect - Crafting in the 2x2 menu while in creative mode - with the GeyserOptionalPack, this grid is hidden as it does not exist on Java. - Distinguishing between left and right clicks in inventories - Redstone dot blockstates -- "Can be placed on/destroyed" tag for *some* blocks - for example, different slab variants that aren't yet split up into separate blocks. - Potion colors implemented using NBT - 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: [Hurricane](/wiki/other/hurricane) can work around it. +- Movement issues around bamboo due to offset differences between Java and Bedrock. Use [Hurricane](/wiki/other/hurricane) to work around it. - Custom anvil recipes or custom smithing table ingredients/patterns ([GeyserMC/Geyser#4706](https://github.com/GeyserMC/Geyser/issues/4706)) - 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 ([GeyserMC/Geyser#3804](https://github.com/GeyserMC/Geyser/issues/3804)) - Dolphin's Grace potion effect visuals (effects should still work correctly) -- Invisible item frames +- Invisible item frames - however, there are Bedrock edition resource packs making *all* item frames invisible - 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. ([GeyserMC/Geyser#3125](https://github.com/GeyserMC/Geyser/issues/3125)) - Custom beacon base blocks ([GeyserMC/Geyser#2301](https://github.com/GeyserMC/Geyser/issues/2301)) - these are hardcoded on Bedrock edition. @@ -48,4 +46,10 @@ The following changes **are supported** with the [GeyserOptionalPack](/wiki/othe - Shulker invisibility - Spectral arrow texture - Scoreboard width that matches Java -- Inventory UI changes to match Java \ No newline at end of file +- Inventory UI changes to match Java + +## Fixable with Hurricane {#fixable-with-hurricane} + +The following issues can be worked around with the [Hurricane](/wiki/other/hurricane) plugin/mod. However, these involve Java server +modifications. +- Movement issues around bamboo due to offset differences between Java and Bedrock. \ No newline at end of file diff --git a/wiki/geyser/events.md b/wiki/geyser/events.md index 378298d..c665a1f 100644 --- a/wiki/geyser/events.md +++ b/wiki/geyser/events.md @@ -35,33 +35,6 @@ public void onGeyserLoadResourcePacksEvent(GeyserLoadResourcePacksEvent event) { If you wish to listen to events in a Spigot/Paper plugin or a Fabric mod, you need to register the Geyser Event Bus as a listener first. Just make sure you implement `EventRegistrar` in the main class of your mod or plugin. Extensions do not need to do that - they are automatically registered, so a simple @Subscribe annotation is enough. -**Fabric mod example:** -```java -public class ExampleMod implements ModInitializer, EventRegistrar { - public static final Logger LOGGER = LoggerFactory.getLogger("modid"); - - @Override - public void onInitialize() { - ServerLifecycleEvents.SERVER_STARTING.register((server) -> { - GeyserApi.api().eventBus().register(this, this); // register your mod & this class instance as a listener - }); - - LOGGER.info("Geyser is cool!"); - } - - // here an event, we subscribe as usual with the @Subscribe annotation - @Subscribe - public void onGeyserPostInitializeEvent(GeyserPostInitializeEvent event) { - LOGGER.info("Geyser started!"); - } -} -``` -:::info - Note: We cannot directly register the event bus in the mod initializer, since the Geyser API would not be loaded yet. -::: - -Therefore, we register it in the server starting event provided by the Fabric API. - **Paper/Spigot plugin example:** 1. In your plugin.yml, add the following lines: @@ -89,10 +62,37 @@ public class ExamplePlugin extends JavaPlugin implements EventRegistrar { ``` 3. If you want to provide your event with a consumer, rather than annotating it, you can also manually subscribe your method to the event bus: ```java -// replace GeyserEvent.class with the event class you want to listen to -GeyserApi.api().eventBus().subscribe(this, GeyserEvent.class, this::yourMethod); +// add this after you register your event registrar in onEnable +GeyserApi.api().eventBus().subscribe(this, GeyserPostInitializeEvent.class, this::onGeyserPostInitializeEvent); ``` +**Fabric mod example:** +```java +public class ExampleMod implements ModInitializer, EventRegistrar { + public static final Logger LOGGER = LoggerFactory.getLogger("modid"); + + @Override + public void onInitialize() { + ServerLifecycleEvents.SERVER_STARTING.register((server) -> { + GeyserApi.api().eventBus().register(this, this); // register your mod & this class instance as a listener + }); + + LOGGER.info("Geyser is cool!"); + } + + // here an event, we subscribe as usual with the @Subscribe annotation + @Subscribe + public void onGeyserPostInitializeEvent(GeyserPostInitializeEvent event) { + LOGGER.info("Geyser started!"); + } +} +``` +:::info + Note: We cannot directly register the event bus in the mod initializer, since the Geyser API would not be loaded yet. +::: + +Therefore, we register it in the server starting event provided by the Fabric API. + ## Event Priority {#event-priority} Events can have a priority, which is used to determine the order in which the listeners are called. The default priority is NORMAL. To (optionally) set the priority of your event listener, you can add the priority to the `@Subscribe` annotation: diff --git a/wiki/geyser/setup/provider/modded-servers.mdx b/wiki/geyser/setup/provider/modded-servers.mdx index 485b63f..e3c0b89 100644 --- a/wiki/geyser/setup/provider/modded-servers.mdx +++ b/wiki/geyser/setup/provider/modded-servers.mdx @@ -41,5 +41,5 @@ Geyser only works with **server-side** mods. Mods that require a client-side ins 5. Verify whether connections are possible by running `geyser connectiontest ` in the console. :::info -For Geyser-Fabric: To allow Bedrock Edition players to join your server without needing to log in to a paid Java Edition account, you can use Floodgate. +To allow Bedrock Edition players to join your server without needing to log in to a paid Java Edition account, you can use Floodgate. ::: \ No newline at end of file diff --git a/wiki/geyser/setup/self/modded-servers.mdx b/wiki/geyser/setup/self/modded-servers.mdx index 74c44c0..ed19def 100644 --- a/wiki/geyser/setup/self/modded-servers.mdx +++ b/wiki/geyser/setup/self/modded-servers.mdx @@ -55,5 +55,5 @@ Geyser only works with **server-side** mods. Mods that require a client-side ins 5. Verify whether connections from other networks are possible by running `geyser connectiontest ` in the console. :::info -For Geyser-Fabric: To allow Bedrock Edition players to join your server without needing to log in to a paid Java Edition account, you can use Floodgate. +To allow Bedrock Edition players to join your server without needing to log in to a paid Java Edition account, you can use Floodgate. ::: \ No newline at end of file diff --git a/wiki/other/hurricane.md b/wiki/other/hurricane.md index 1aef24a..05b76f1 100644 --- a/wiki/other/hurricane.md +++ b/wiki/other/hurricane.md @@ -1,6 +1,6 @@ --- title: Hurricane -description: Hurricane is a Paper / Spigot plugin and Fabric mod that fixes some bugs that otherwise cannot be fixed without server-side modification. +description: Hurricane is a Paper / Spigot plugin and Fabric / NeoForge mod that fixes some bugs that otherwise cannot be fixed without server-side modification. --- # Hurricane @@ -8,14 +8,13 @@ description: Hurricane is a Paper / Spigot plugin and Fabric mod that fixes some Hurricane is a Paper/Spigot plugin, and Fabric mod (unofficial port), that fixes some bugs that otherwise cannot be fixed without server modification. ## Fixes {#fixes} -Issues with each workaround are listed in the plugin's config. **Please take your time to read them as the workarounds in this plugin can be used for exploitative purposes.** +Issues with each workaround are listed in the Hurricane config. **Please take your time to read them as the workarounds in this plugin can be used for exploitative purposes.** - Bamboo and dripstone collision (by setting them to no server-side collision) -- [GeyserMC/Geyser#638](https://github.com/GeyserMC/Geyser/issues/638) by implementing the control server-side. Supported Versions: -- 1.14.x - 1.20.x -- 1.17.x & above for pig riding +- Spigot/Paper: 1.14.x - 1.21.1 +- Fabric: 1.21/1.21.1 ## Download {#download} - Spigot/Paper: [GeyserMC downloads page](/download?project=other-projects&hurricane=expanded)