Legacy/BungeeGuard forwarding FML/FORGE hostname token fixes#1785
Open
p0t4t0sandwich wants to merge 6 commits intoPaperMC:dev/3.0.0from
Open
Legacy/BungeeGuard forwarding FML/FORGE hostname token fixes#1785p0t4t0sandwich wants to merge 6 commits intoPaperMC:dev/3.0.0from
FML/FORGE hostname token fixes#1785p0t4t0sandwich wants to merge 6 commits intoPaperMC:dev/3.0.0from
Conversation
…he player properties, similar to LegacyForgeConnectionType, and fix netVersion typo
…h how Waterfall handles extra data, meaning backend consumers could use the same logic to handle both modern and legacy data.
…lient" property, as to not confuse existing backend implementations.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
While working through implementing Legacy+BungeeGuard forwarding for ProxyCompatibleForge, I realized that #1176 never implemented a way for Velocity to forward the modern
FORGE[#]hostname token when legacy forwarding types were in use.Additionally, while testing I found that the existing token forwarding for 1.8 - 1.12.2 didn't work with BungeeGuard forwarding.
The latter was a simple one-line fix, but I'd like some feedback regarding forwarding the modern
FORGE[#]token, or if there are any other sections that need a tidy.Somewhat in-line with Waterfall's
"forgeClient"and"extraData"properties, I've added a new"modernForgeClient"property to account for backend implementations that always associate"forgeClient"with the olderFMLtoken, or backend implementations built with respect to Waterfall assuming the forwarded token is in the form ofFML[#]. Any implementation that appends the"extraData"verbatim to the hostname (and replaces\1with\0) should continue to function as expected.To note, I've explicitly strayed away from adding additional handling for
FML2andFML3(Forge 1.13.2 - 1.20.1 and NeoForge 1.20.2), as in testing I found the resulting handshake errors from NeoForge 1.20.2 to be quite ambiguous, and would probably confuse users more than the current "vanilla <-> Neo/Forge" connection errors they would encounter.Some notes regarding Neo/Forge markers:
N/A\0FORGE + NET_VERSION\0FML + NET_VERSION, whereNET_VERSIONis only ever3\0FML + NET_VERSION\0FML2\0FML3\0FML\0