Repository navigation
Improve sendEmote api - #6655
Conversation
Novampr
left a comment
Novampr
left a comment
There was a problem hiding this comment.
Generally seems good, would be happy to merge provided this was tested correctly (which I trust you have)
|
So the gametests where the thing causing publishToMavenLocal to not work for me, disabled that temporarily and properly tested this PR with mannequins Tho mannequin's name in emote chat announcements is completely blank, do we force the silent bool for mannequins or do we leave it like this? |
|
Decided to force silence the emote message if the entity name is blank |
eclipseisoffline
added
PR: Feature
eclipseisoffline
left a comment
eclipseisoffline
left a comment
There was a problem hiding this comment.
Would like to get this in our 26.60 update - once we have a feature branch for that the target of this PR can be updated. It looks like some unrelated changes got in your PR when merging branches earlier (FloodgateSkinUploader and Constants), but those should hopefully resolve themselves when updating the target.
eclipseisoffline
left a comment
eclipseisoffline
left a comment
There was a problem hiding this comment.
This looks good to me now, thank you!
1060797 to
f21e9eb
Compare
|
Could you merge the 26.60 branch into yours? Then this PR should be good to go! |
feature/26.60 -> Improve sendEmote api (attempt 2)
f21e9eb to
3869346
Compare
# Conflicts: # core/src/main/java/org/geysermc/geyser/network/bedrock/CodecProcessor.java # core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java # core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java # core/src/main/java/org/geysermc/geyser/registry/populator/conversion/ICanHasMoreStates.java # core/src/main/java/org/geysermc/geyser/registry/populator/conversion/ICanHasStates.java # core/src/main/java/org/geysermc/geyser/registry/populator/conversion/WildernessBoundConverter.java # core/src/main/resources/mappings
This PR deprecates the
GeyserConnection#sendEmote(GeyserPlayerEntity, String)and replaces it withGeyserConnection#sendEmote(AvatarEntity, String, boolean), which allows this to work with both Mannequin and Player entities, and also gives the option to silence the chat announcementI wasn't able to test the new API method I added since I cant get publishToMavenLocal to work, but this does compile fine, and plugins using the (now) deprecated method still work
First actual PR, feel free to criticize
There is a few things im unsure of that might need changing before merging
for
GeyserEntityData.java, I wasn't able to remove the old method since Geyser wouldn't compile if I did that, so I had to make a new method and redirect the old one to that. I also had to make a new method inEntityData.javawhich im not a fan of since its just useless rnAnd also in
GeyserConnection.java, not sure if I should say "avatar entity" or "player or mannequin entity" in the javadoc