Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add a /geyser ping command #4131

Merged
merged 7 commits into from
Jul 12, 2024
Merged

Add a /geyser ping command #4131

merged 7 commits into from
Jul 12, 2024

Conversation

onebeastchris
Copy link
Member

@onebeastchris onebeastchris commented Sep 18, 2023 •
edited
Loading

Implements #3552 to show the ping between the Bedrock client <-> Geyser server.
Huge thanks to rk_01 for the help!

Note: There are two methods in RakSessionCodec that can be used for this purpose - not fully sure which one would be the best to use here. Both seemed to have similar values during testing.

Requires GeyserMC/languages#117 for the lang strings.

Closes #3552, closes #4379

Currently blocked by the cloud PR as it changes language strings.

@onebeastchris onebeastchris mentioned this pull request Sep 18, 2023
Merged
@Konicai
Copy link
Member

Konicai commented Sep 19, 2023

If Geyser's languages submodule is updated before the cloud PR is merged, I need to fix usages by the master branch of certain lang strings, before the submodule is updated. This is alright, I'm just saying it needs to be done first.

@onebeastchris
Copy link
Member Author

This PR can totally wait until after cloud is merged, it's by no means urgent :)

@onebeastchris onebeastchris added PR: Feature When a PR implements a new feature API The issue/feature request relates to the Geyser API PR: Needs review Indicates that a PR is functional and review-ready. labels Oct 7, 2023
@AuroraLS3 AuroraLS3 mentioned this pull request Jan 4, 2024
Closed
@onebeastchris onebeastchris added PR: On hold When a PR is on hold like if it requires a dependency to be updated first and removed PR: Needs review Indicates that a PR is functional and review-ready. labels Jun 24, 2024
@onebeastchris onebeastchris marked this pull request as draft June 24, 2024 12:41
@onebeastchris
Merge remote-tracking branch 'refs/remotes/upstream/api/2.4.1' into p…
7d20581 
…ingcommand

# Conflicts:
#	core/src/main/java/org/geysermc/geyser/command/GeyserCommandManager.java
@onebeastchris
Update to cloud changes
51ac4c6
@onebeastchris onebeastchris marked this pull request as ready for review July 12, 2024 09:10
@onebeastchris onebeastchris changed the base branch from master to api/2.4.1 July 12, 2024 09:10
@onebeastchris onebeastchris removed the PR: On hold When a PR is on hold like if it requires a dependency to be updated first label Jul 12, 2024
@onebeastchris onebeastchris merged commit 51a1295 into GeyserMC:api/2.4.1 Jul 12, 2024
2 checks passed
@onebeastchris onebeastchris mentioned this pull request Jul 14, 2024
Merged
2 tasks
letsgoawaydev pushed a commit to letsgoawaydev/Geyser that referenced this pull request Jul 21, 2024
@onebeastchris @letsgoawaydev
Add a /geyser ping command (GeyserMC#4131)
a9c6d8b 
* Init: Add /geyser ping command

* Block just console execution, not everything but console senders

* Use RTT as that seems to vary less wildly compared to getPing()

* Cleanup, use lang strings

* Add ping() method to GeyserConnection in api

* Update to cloud changes
letsgoawaydev added a commit to letsgoawaydev/Geyser that referenced this pull request Jul 21, 2024
@letsgoawaydev
Squashed commit of the following:
a402087 
commit 7bd4f9c
Author: Ethan <[email protected]>
Date:   Sun Jul 21 21:50:37 2024 +0800

    Half complete GuiData commit, needs some changes most likely

commit d78441a
Merge: 6338d1c 4547431
Author: Ethan <[email protected]>
Date:   Sun Jul 21 21:33:41 2024 +0800

    Merge branch 'send-toast-api' of https://github.com/letsgoawaydev/Geyser into send-toast-api

commit 6338d1c
Author: Ethan <[email protected]>
Date:   Sun Jul 21 21:33:37 2024 +0800

    test

commit 0654d2d
Author: chris <[email protected]>
Date:   Sun Jul 21 13:11:27 2024 +0200

    Fix: Text display offset <GeyserMC#4439> (GeyserMC#4883)

commit 57919db
Author: chris <[email protected]>
Date:   Sun Jul 21 02:15:38 2024 +0200

    Somewhat fix: firework recipe not showing up in recipe book (GeyserMC#4873)

    * Somewhat fix firework crafting

    * Use instanceof instead of casting

commit 23d53db
Author: chris <[email protected]>
Date:   Sun Jul 21 02:10:51 2024 +0200

    Fix: Only shutdown/close handlers in onDisable if they're nonnull (GeyserMC#4882)

commit 6459f67
Author: LetsGoAway <[email protected]>
Date:   Sat Jul 20 18:09:22 2024 +0800

    Use the correct way of sending block breaking particles (GeyserMC#4825)

commit ebc7f30
Author: Camotoy <[email protected]>
Date:   Sat Jul 20 23:22:04 2024 -0400

    Respect block range attribute where we can

    GeyserMC#4864

commit bf16ddb
Author: Camotoy <[email protected]>
Date:   Sat Jul 20 23:21:36 2024 -0400

    Small cleanups

commit 2d73e51
Author: chris <[email protected]>
Date:   Wed Jul 17 21:44:53 2024 +0200

    Properly fix hanging signs (GeyserMC#4872)

commit 3fad986
Author: Camotoy <[email protected]>
Date:   Wed Jul 17 14:21:41 2024 -0400

    Fix GeyserMC#4870

commit 3144721
Author: Valaphee The Meerkat <[email protected]>
Date:   Tue Jul 16 14:13:34 2024 +0200

    Empty player list on phase transition, despawn skulls, always reset weather (GeyserMC#4847)

    * Empty player list on transition, despawn skulls

    * Always reset weather

commit 07bdc1c
Author: masel.io <[email protected]>
Date:   Tue Jul 16 11:23:30 2024 +0200

    Add Timeout to CompletableFuture in GeyserBungeePingPassthrough to Prevent Memory Leak (GeyserMC#4858)

    * fix: Add timeout for GeyserBungeePingPassthrough#getPingInformation

    Signed-off-by: ByteExceptionM <[email protected]>

    * fix: Use Geyser Logger instead of Bungee Logger

    Signed-off-by: ByteExceptionM <[email protected]>

    * Fix typo

    Co-authored-by: Konicai <[email protected]>

    * chore: Add ip suppression if configured

    Signed-off-by: ByteExceptionM <[email protected]>

    * Remove empty line

    Co-authored-by: chris <[email protected]>

    * Remove empty line

    Co-authored-by: chris <[email protected]>

    ---------

    Signed-off-by: ByteExceptionM <[email protected]>
    Co-authored-by: Konicai <[email protected]>
    Co-authored-by: chris <[email protected]>

commit ea4a21c
Author: Camotoy <[email protected]>
Date:   Mon Jul 15 15:16:45 2024 -0400

    Indicate support for Bedrock 1.21.3

commit 6dfb1a8
Author: chris <[email protected]>
Date:   Mon Jul 15 01:31:03 2024 +0200

    Fix: Block place sounds on mod platforms (GeyserMC#4859)

commit 215b12e
Author: chris <[email protected]>
Date:   Sun Jul 14 21:55:57 2024 +0200

    Fix: Totem animation when playing totem effects manually (GeyserMC#4860)

    * Fix: Totem animation for manually played totem effects

    * Ensure we always reset the offhand correctly

commit 92112f4
Author: chris <[email protected]>
Date:   Sun Jul 14 20:17:22 2024 +0200

    Fix: Send a container close packet to Java for containers that could not be opened (GeyserMC#4861)

    * Close containers if we did not manage to open it

    * Mark session inventory translator as nonnull

commit 054fc09
Author: LetsGoAway <[email protected]>
Date:   Sun Jul 14 16:44:39 2024 +0800

    Correctly cap scale attribute (GeyserMC#4856)

    * Fix scale attribute cap

    * Update LivingEntity.java

commit c862d5a
Author: chris <[email protected]>
Date:   Sat Jul 13 22:00:15 2024 +0200

    Fix: Manually translated item names for block items not showing up properly (GeyserMC#4857)

commit 94f17d1
Author: chris <[email protected]>
Date:   Sat Jul 13 18:53:13 2024 +0200

    Fix: Item color names/glint for rare items (GeyserMC#4763)

    * debug stick changes

    * yay light purple item name

    * Address review

    * Auto-generate rarity

    * Add glint generation

    * Translate all rare items properly

    * Use putIfAbsent instead of double checks

commit e127f9e
Author: chris <[email protected]>
Date:   Fri Jul 12 20:55:40 2024 +0200

    Fix: hanging sign recipe not showing up in the recipe book (GeyserMC#4814)

commit 4547431
Merge: 96aecd2 b213fb5
Author: Ethan <[email protected]>
Date:   Sun Jul 21 21:02:04 2024 +0800

    Merge branch 'send-toast-api' of https://github.com/letsgoawaydev/Geyser into send-toast-api

commit 96aecd2
Author: chris <[email protected]>
Date:   Sun Jul 14 22:09:55 2024 +0200

    Feature: API to switch items in the offhand/mainhand (GeyserMC#4819)

commit a9c6d8b
Author: chris <[email protected]>
Date:   Fri Jul 12 20:42:31 2024 +0200

    Add a /geyser ping command  (GeyserMC#4131)

    * Init: Add /geyser ping command

    * Block just console execution, not everything but console senders

    * Use RTT as that seems to vary less wildly compared to getPing()

    * Cleanup, use lang strings

    * Add ping() method to GeyserConnection in api

    * Update to cloud changes

commit a57671e
Author: Konicai <[email protected]>
Date:   Thu Jul 11 23:56:42 2024 -0500

    Cloud for commands (GeyserMC#3808)

    Co-authored-by: onebeastchris <[email protected]>

commit b213fb5
Author: chris <[email protected]>
Date:   Sun Jul 14 22:09:55 2024 +0200

    Feature: API to switch items in the offhand/mainhand (GeyserMC#4819)

commit 51a1295
Author: chris <[email protected]>
Date:   Fri Jul 12 20:42:31 2024 +0200

    Add a /geyser ping command  (GeyserMC#4131)

    * Init: Add /geyser ping command

    * Block just console execution, not everything but console senders

    * Use RTT as that seems to vary less wildly compared to getPing()

    * Cleanup, use lang strings

    * Add ping() method to GeyserConnection in api

    * Update to cloud changes

commit af60a77
Author: Konicai <[email protected]>
Date:   Thu Jul 11 23:56:42 2024 -0500

    Cloud for commands (GeyserMC#3808)

    Co-authored-by: onebeastchris <[email protected]>
letsgoawaydev added a commit to letsgoawaydev/Geyser that referenced this pull request Jul 21, 2024
@letsgoawaydev
Squashed commit of the following:
0a602dc 
commit 7bd4f9c
Author: Ethan <[email protected]>
Date:   Sun Jul 21 21:50:37 2024 +0800

    Half complete GuiData commit, needs some changes most likely

commit d78441a
Merge: 6338d1c 4547431
Author: Ethan <[email protected]>
Date:   Sun Jul 21 21:33:41 2024 +0800

    Merge branch 'send-toast-api' of https://github.com/letsgoawaydev/Geyser into send-toast-api

commit 6338d1c
Author: Ethan <[email protected]>
Date:   Sun Jul 21 21:33:37 2024 +0800

    test

commit 0654d2d
Author: chris <[email protected]>
Date:   Sun Jul 21 13:11:27 2024 +0200

    Fix: Text display offset <GeyserMC#4439> (GeyserMC#4883)

commit 57919db
Author: chris <[email protected]>
Date:   Sun Jul 21 02:15:38 2024 +0200

    Somewhat fix: firework recipe not showing up in recipe book (GeyserMC#4873)

    * Somewhat fix firework crafting

    * Use instanceof instead of casting

commit 23d53db
Author: chris <[email protected]>
Date:   Sun Jul 21 02:10:51 2024 +0200

    Fix: Only shutdown/close handlers in onDisable if they're nonnull (GeyserMC#4882)

commit 6459f67
Author: LetsGoAway <[email protected]>
Date:   Sat Jul 20 18:09:22 2024 +0800

    Use the correct way of sending block breaking particles (GeyserMC#4825)

commit ebc7f30
Author: Camotoy <[email protected]>
Date:   Sat Jul 20 23:22:04 2024 -0400

    Respect block range attribute where we can

    GeyserMC#4864

commit bf16ddb
Author: Camotoy <[email protected]>
Date:   Sat Jul 20 23:21:36 2024 -0400

    Small cleanups

commit 2d73e51
Author: chris <[email protected]>
Date:   Wed Jul 17 21:44:53 2024 +0200

    Properly fix hanging signs (GeyserMC#4872)

commit 3fad986
Author: Camotoy <[email protected]>
Date:   Wed Jul 17 14:21:41 2024 -0400

    Fix GeyserMC#4870

commit 3144721
Author: Valaphee The Meerkat <[email protected]>
Date:   Tue Jul 16 14:13:34 2024 +0200

    Empty player list on phase transition, despawn skulls, always reset weather (GeyserMC#4847)

    * Empty player list on transition, despawn skulls

    * Always reset weather

commit 07bdc1c
Author: masel.io <[email protected]>
Date:   Tue Jul 16 11:23:30 2024 +0200

    Add Timeout to CompletableFuture in GeyserBungeePingPassthrough to Prevent Memory Leak (GeyserMC#4858)

    * fix: Add timeout for GeyserBungeePingPassthrough#getPingInformation

    Signed-off-by: ByteExceptionM <[email protected]>

    * fix: Use Geyser Logger instead of Bungee Logger

    Signed-off-by: ByteExceptionM <[email protected]>

    * Fix typo

    Co-authored-by: Konicai <[email protected]>

    * chore: Add ip suppression if configured

    Signed-off-by: ByteExceptionM <[email protected]>

    * Remove empty line

    Co-authored-by: chris <[email protected]>

    * Remove empty line

    Co-authored-by: chris <[email protected]>

    ---------

    Signed-off-by: ByteExceptionM <[email protected]>
    Co-authored-by: Konicai <[email protected]>
    Co-authored-by: chris <[email protected]>

commit ea4a21c
Author: Camotoy <[email protected]>
Date:   Mon Jul 15 15:16:45 2024 -0400

    Indicate support for Bedrock 1.21.3

commit 6dfb1a8
Author: chris <[email protected]>
Date:   Mon Jul 15 01:31:03 2024 +0200

    Fix: Block place sounds on mod platforms (GeyserMC#4859)

commit 215b12e
Author: chris <[email protected]>
Date:   Sun Jul 14 21:55:57 2024 +0200

    Fix: Totem animation when playing totem effects manually (GeyserMC#4860)

    * Fix: Totem animation for manually played totem effects

    * Ensure we always reset the offhand correctly

commit 92112f4
Author: chris <[email protected]>
Date:   Sun Jul 14 20:17:22 2024 +0200

    Fix: Send a container close packet to Java for containers that could not be opened (GeyserMC#4861)

    * Close containers if we did not manage to open it

    * Mark session inventory translator as nonnull

commit 054fc09
Author: LetsGoAway <[email protected]>
Date:   Sun Jul 14 16:44:39 2024 +0800

    Correctly cap scale attribute (GeyserMC#4856)

    * Fix scale attribute cap

    * Update LivingEntity.java

commit c862d5a
Author: chris <[email protected]>
Date:   Sat Jul 13 22:00:15 2024 +0200

    Fix: Manually translated item names for block items not showing up properly (GeyserMC#4857)

commit 94f17d1
Author: chris <[email protected]>
Date:   Sat Jul 13 18:53:13 2024 +0200

    Fix: Item color names/glint for rare items (GeyserMC#4763)

    * debug stick changes

    * yay light purple item name

    * Address review

    * Auto-generate rarity

    * Add glint generation

    * Translate all rare items properly

    * Use putIfAbsent instead of double checks

commit e127f9e
Author: chris <[email protected]>
Date:   Fri Jul 12 20:55:40 2024 +0200

    Fix: hanging sign recipe not showing up in the recipe book (GeyserMC#4814)

commit 4547431
Merge: 96aecd2 b213fb5
Author: Ethan <[email protected]>
Date:   Sun Jul 21 21:02:04 2024 +0800

    Merge branch 'send-toast-api' of https://github.com/letsgoawaydev/Geyser into send-toast-api

commit 96aecd2
Author: chris <[email protected]>
Date:   Sun Jul 14 22:09:55 2024 +0200

    Feature: API to switch items in the offhand/mainhand (GeyserMC#4819)

commit a9c6d8b
Author: chris <[email protected]>
Date:   Fri Jul 12 20:42:31 2024 +0200

    Add a /geyser ping command  (GeyserMC#4131)

    * Init: Add /geyser ping command

    * Block just console execution, not everything but console senders

    * Use RTT as that seems to vary less wildly compared to getPing()

    * Cleanup, use lang strings

    * Add ping() method to GeyserConnection in api

    * Update to cloud changes

commit a57671e
Author: Konicai <[email protected]>
Date:   Thu Jul 11 23:56:42 2024 -0500

    Cloud for commands (GeyserMC#3808)

    Co-authored-by: onebeastchris <[email protected]>
@onebeastchris onebeastchris deleted the pingcommand branch July 23, 2024 22:30
Konicai pushed a commit that referenced this pull request Aug 1, 2024
@onebeastchris @Konicai
Add a /geyser ping command (#4131)
48311f8 
* Init: Add /geyser ping command

* Block just console execution, not everything but console senders

* Use RTT as that seems to vary less wildly compared to getPing()

* Cleanup, use lang strings

* Add ping() method to GeyserConnection in api

* Update to cloud changes
onebeastchris added a commit to onebeastchris/Geyser that referenced this pull request Aug 27, 2024
@onebeastchris
Add a /geyser ping command (GeyserMC#4131)
57b899a 
* Init: Add /geyser ping command

* Block just console execution, not everything but console senders

* Use RTT as that seems to vary less wildly compared to getPing()

* Cleanup, use lang strings

* Add ping() method to GeyserConnection in api

* Update to cloud changes
XingLingQAQ pushed a commit to XingLingQAQ/Geyser that referenced this pull request Sep 25, 2024
@onebeastchris @XingLingQAQ
Add a /geyser ping command (GeyserMC#4131)
08e5977 
* Init: Add /geyser ping command

* Block just console execution, not everything but console senders

* Use RTT as that seems to vary less wildly compared to getPing()

* Cleanup, use lang strings

* Add ping() method to GeyserConnection in api

* Update to cloud changes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rtm516 rtm516 rtm516 approved these changes

Assignees
No one assigned
Labels
API The issue/feature request relates to the Geyser API PR: Feature When a PR implements a new feature
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add support for Java server EntityPlayer#latency field Add command /geyser ping
3 participants
@onebeastchris @Konicai @rtm516