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

Send Toast API #4840

Closed
wants to merge 6 commits into from
Closed

Send Toast API #4840

wants to merge 6 commits into from

Conversation

letsgoawaydev
Copy link
Contributor

@letsgoawaydev letsgoawaydev commented Jul 9, 2024 •
edited by onebeastchris
Loading

Made a PR for my own issue lol (closes #4839)

Konicai
Konicai requested changes Jul 9, 2024
View reviewed changes
Copy link
Member

@Konicai Konicai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks!

api/src/main/java/org/geysermc/geyser/api/bedrock/camera/CameraData.java Outdated Show resolved Hide resolved
core/src/main/java/org/geysermc/geyser/impl/camera/GeyserCameraData.java Outdated Show resolved Hide resolved
@Camotoy
Copy link
Member

Camotoy commented Jul 9, 2024

Looks fine. IMO this isn't a "camera" feature - I would move it to the base or create a new section for ui()/gui() (I could see more form features added here, like form closing).

@Konicai @onebeastchris
Cloud for commands (GeyserMC#3808)
af60a77 
Co-authored-by: onebeastchris <github@onechris.mozmail.com>
@letsgoawaydev
Copy link
Contributor Author

Looks fine. IMO this isn't a "camera" feature - I would move it to the base or create a new section for ui()/gui() (I could see more form features added here, like form closing).

Moved to GeyserConnection in latest commit

onebeastchris
onebeastchris approved these changes Jul 12, 2024
View reviewed changes
Copy link
Member

@onebeastchris onebeastchris left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me otherwise. Please also change the base of this PR to the new api/2.4.1 branch - we plan to merge some other api changes (cloud :p) soon-ish, so it would make sense to combine them to avoid more version bumps than necessary

api/src/main/java/org/geysermc/geyser/api/connection/GeyserConnection.java Outdated Show resolved Hide resolved
core/src/main/java/org/geysermc/geyser/impl/camera/GeyserCameraData.java Outdated Show resolved Hide resolved
@onebeastchris
Add a /geyser ping command (GeyserMC#4131)
51a1295 
* 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 letsgoawaydev changed the base branch from master to api/2.4.1 July 13, 2024 03:44
@letsgoawaydev
Copy link
Contributor Author

Should be merged with api/2.4.1, i am on mobile at the moment so there might be issues with the code

@Konicai
Copy link
Member

Konicai commented Jul 13, 2024

It doesn't make sense to me for this to be in GeyserSession while there is already UI stuff in CameraData (GuiElement). If we are going to keep the UI features separate from the camera features, then lets create a new class for them now.

also, this PR needs to be rebased

@onebeastchris onebeastchris mentioned this pull request Jul 14, 2024
Merged
2 tasks
@Konicai Konicai added the API The issue/feature request relates to the Geyser API label Jul 15, 2024
@letsgoawaydev
Copy link
Contributor Author

accidentally closed because i am rewriting this and have no idea how to use git apparently my bad

@letsgoawaydev
Copy link
Contributor Author

i will reopen once i finish it properly

@letsgoawaydev letsgoawaydev reopened this Jul 21, 2024
@letsgoawaydev letsgoawaydev marked this pull request as draft July 21, 2024 13:51
@letsgoawaydev
Copy link
Contributor Author

Reopened as draft as I haven't tested the changes yet but I would like to know if the way I have moved the GUI stuff is correct or not.

@onebeastchris
Copy link
Member

did you rebase this on the master, or api/2.4.1 branch?

@letsgoawaydev
Copy link
Contributor Author

master it seems :/

@letsgoawaydev
Copy link
Contributor Author

rebase messed up, going to hopefully try again tomorrow if i can

@letsgoawaydev letsgoawaydev reopened this Jul 22, 2024
@letsgoawaydev
Copy link
Contributor Author

All right I think I have gotten it to work properly now, but still keeping it as draft just in case. I've made a separate class GuiData for all the GUI stuff in a way that hopefully doesn't completely break old code

@letsgoawaydev
Squashed commit of the following:
fd01f06 
commit 1dd9ba3
Author: chris <github@onechris.mozmail.com>
Date:   Mon Jul 22 07:24:21 2024 +0200

    Fix: Allow items to be worn as hats if their Java base items also allow it (GeyserMC#4885)

commit b248abf
Author: chris <github@onechris.mozmail.com>
Date:   Sun Jul 21 13:11:27 2024 +0200

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

commit ddce101
Merge: 7d5c4a3 96f0098
Author: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date:   Sat Jul 20 23:22:12 2024 -0400

    Merge branch 'master' of https://github.com/GeyserMC/Geyser

commit 7d5c4a3
Author: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date:   Sat Jul 20 23:22:04 2024 -0400

    Respect block range attribute where we can

    GeyserMC#4864

commit c9e423a
Author: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date:   Sat Jul 20 23:21:36 2024 -0400

    Small cleanups

commit 96f0098
Author: chris <github@onechris.mozmail.com>
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 f62cef7
Author: chris <github@onechris.mozmail.com>
Date:   Sun Jul 21 02:10:51 2024 +0200

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

commit 8fd99e1
Author: LetsGoAway <68365423+letsgoawaydev@users.noreply.github.com>
Date:   Sat Jul 20 18:09:22 2024 +0800

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

commit 9fe3acc
Author: chris <github@onechris.mozmail.com>
Date:   Wed Jul 17 21:44:53 2024 +0200

    Properly fix hanging signs (GeyserMC#4872)

commit 406eae2
Author: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date:   Wed Jul 17 14:21:41 2024 -0400

    Fix GeyserMC#4870

commit 669a76c
Author: Valaphee The Meerkat <32491319+valaphee@users.noreply.github.com>
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 677a56c
Author: masel.io <git@byteexception.eu>
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 <git@byteexception.eu>

    * fix: Use Geyser Logger instead of Bungee Logger

    Signed-off-by: ByteExceptionM <git@byteexception.eu>

    * Fix typo

    Co-authored-by: Konicai <71294714+Konicai@users.noreply.github.com>

    * chore: Add ip suppression if configured

    Signed-off-by: ByteExceptionM <git@byteexception.eu>

    * Remove empty line

    Co-authored-by: chris <github@onechris.mozmail.com>

    * Remove empty line

    Co-authored-by: chris <github@onechris.mozmail.com>

    ---------

    Signed-off-by: ByteExceptionM <git@byteexception.eu>
    Co-authored-by: Konicai <71294714+Konicai@users.noreply.github.com>
    Co-authored-by: chris <github@onechris.mozmail.com>

commit 305495c
Author: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date:   Mon Jul 15 15:16:45 2024 -0400

    Indicate support for Bedrock 1.21.3

commit efc8ba0
Author: chris <github@onechris.mozmail.com>
Date:   Mon Jul 15 01:31:03 2024 +0200

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

commit 0689050
Author: chris <github@onechris.mozmail.com>
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 9cdda70
Author: chris <github@onechris.mozmail.com>
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 49f66c2
Author: LetsGoAway <68365423+letsgoawaydev@users.noreply.github.com>
Date:   Sun Jul 14 16:44:39 2024 +0800

    Correctly cap scale attribute (GeyserMC#4856)

    * Fix scale attribute cap

    * Update LivingEntity.java

commit 6ab0186
Author: chris <github@onechris.mozmail.com>
Date:   Sat Jul 13 22:00:15 2024 +0200

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

commit b0c7ddb
Author: chris <github@onechris.mozmail.com>
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 93b0a61
Author: chris <github@onechris.mozmail.com>
Date:   Fri Jul 12 20:55:40 2024 +0200

    Fix: hanging sign recipe not showing up in the recipe book (GeyserMC#4814)
@onebeastchris
Copy link
Member

Personally, my two cents would be to leave the GUI stuff in camera data - one could argue that it's constantly in the players camera view - and call the new section 'MessageData' - or a similar term specifically indicating that it's for sending info to users (sending messages/toasts to users, or in future closing forms/sending action bars).

@Konicai
Copy link
Member

Konicai commented Jul 22, 2024

Commits are borked :(

Remember to reference api/2.4.1 when doing merges or rebases

@letsgoawaydev
Copy link
Contributor Author

Commits are borked :(

Remember to reference api/2.4.1 when doing merges or rebases

maybe ill just remove the squash commit because every time i try to update the branch with master in some way it completely breaks

and who ever knows what they are doing after this PR can update it

@Konicai Konicai changed the base branch from api/2.4.1 to api/2.4.2 August 2, 2024 01:23
@Konicai Konicai added this to the api/2.4.2 milestone Aug 2, 2024
@Konicai Konicai added the PR: Feature When a PR implements a new feature label Aug 2, 2024
@letsgoawaydev
Copy link
Contributor Author

Closing this as i am going to redo it and the pr is so unbelievably broken that it is probably easier just to make a new one

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

@Konicai Konicai Awaiting requested review from Konicai

@onebeastchris onebeastchris Awaiting requested review from onebeastchris

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
api/2.4.2
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@letsgoawaydev @Camotoy @Konicai @onebeastchris