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

Remove unofficial skin sources and add skin event for extensions #4507

Merged
merged 19 commits into from
May 14, 2024
Merged

Remove unofficial skin sources and add skin event for extensions #4507

merged 19 commits into from
May 14, 2024

Conversation

rtm516
Copy link
Member

@rtm516 rtm516 commented Mar 17, 2024 •
edited
Loading

All unofficial cape and ears sources have been removed.

Ears/capes are now part of an extension GeyserMC/ThirdPartyCosmetics

New event SessionSkinApplyEvent for customising the skin, cape and geometry that's loaded for a player.

Needs documentation adding to the wiki and likely some testing to make sure I didn't break any skin stuff.

@rtm516 rtm516 added PR: Feature When a PR implements a new feature PR: Needs Testing When a PR needs testing but is currently not under review labels Mar 17, 2024
rtm516 and others added 2 commits March 17, 2024 22:18
@rtm516 @onebeastchris
Accept suggestion on SkinGeometry
9c8b6de 
Co-authored-by: chris <github@onechris.mozmail.com>
@rtm516
Add javadoc and update copyright
48ac798
@Camotoy
Copy link
Member

Camotoy commented Mar 17, 2024 •
edited
Loading

I'm not a big fan on doing a map lookup for connectionByUuid every time the event is fired, so if there's a way we can avoid that, that'd be stellar. Maybe we can just pass the player UUID?

@rtm516
Copy link
Member Author

rtm516 commented Mar 18, 2024

I'm not a big fan on doing a map lookup for connectionByUuid every time the event is fired, so if there's a way we can avoid that, that'd be stellar. Maybe we can just pass the player UUID?

We do pass the player UUID but likely some extensions will only want to modify java players and this is the only reliable way of checking, as other methods like checking version of the UUID only are reliable with floodgate, other auth types this falls apart on.

@onebeastchris onebeastchris linked an issue Mar 19, 2024 that may be closed by this pull request
API to Modify Skins Sent to Bedrock Players #4050
Closed
@rtm516 rtm516 requested review from onebeastchris and Camotoy April 25, 2024 13:32
@rtm516 rtm516 removed the PR: Needs Testing When a PR needs testing but is currently not under review label Apr 25, 2024
@rtm516 rtm516 requested a review from onebeastchris April 25, 2024 15:34
@rtm516 rtm516 requested a review from Camotoy April 26, 2024 21:36
onebeastchris
onebeastchris approved these changes May 2, 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.

Just noticed that a few annotations/no null checks are missing, those should probably be added :)

api/src/main/java/org/geysermc/geyser/api/event/bedrock/SessionSkinApplyEvent.java Outdated Show resolved Hide resolved
api/src/main/java/org/geysermc/geyser/api/event/bedrock/SessionSkinApplyEvent.java Outdated Show resolved Hide resolved
api/src/main/java/org/geysermc/geyser/api/event/bedrock/SessionSkinApplyEvent.java Outdated Show resolved Hide resolved
api/src/main/java/org/geysermc/geyser/api/event/bedrock/SessionSkinApplyEvent.java Outdated Show resolved Hide resolved
api/src/main/java/org/geysermc/geyser/api/event/bedrock/SessionSkinApplyEvent.java Outdated Show resolved Hide resolved
gradle.properties Outdated Show resolved Hide resolved
core/src/main/java/org/geysermc/geyser/skin/SkinProvider.java Outdated Show resolved Hide resolved
core/src/main/java/org/geysermc/geyser/skin/SkinProvider.java Outdated Show resolved Hide resolved
core/src/main/java/org/geysermc/geyser/skin/SkinProvider.java Outdated Show resolved Hide resolved
core/src/main/java/org/geysermc/geyser/skin/SkinProvider.java Outdated Show resolved Hide resolved
@onebeastchris onebeastchris linked an issue May 7, 2024 that may be closed by this pull request
Send event when Geyser shows other player to client #4551
Closed
@onebeastchris onebeastchris merged commit b11a6d7 into GeyserMC:master May 14, 2024
2 checks passed
@rtm516 rtm516 deleted the feature/skin-rework branch May 14, 2024 12:24
XingLingQAQ pushed a commit to XingLingQAQ/Geyser that referenced this pull request Sep 25, 2024
@rtm516 @onebeastchris @XingLingQAQ
Remove unofficial skin sources and add skin event for extensions (Gey…
cb9d9ab 
…serMC#4507)

* Remove ears and unoffical skin sources

* Remove supplyEars

* Cleanup and add SkinApplyEvent

* Add failed back to skin

* Accept suggestion on SkinGeometry

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

* Add javadoc and update copyright

* Remove old config options

* Make SkinApplyEvent a ConnectionEvent

* Add warning about third-party config options

* Update warning message

* Add javadoc to event

* Fix javadoc

* Ajust for review and bump version to 2.2.4

* Get rid of array and preserve original skin data

* Add originalSkin method to event

* Handle NonNull in SessionSkinApplyEvent

* Revert default copyright change

---------

Co-authored-by: chris <github@onechris.mozmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@onebeastchris onebeastchris onebeastchris approved these changes

@Camotoy Camotoy Awaiting requested review from Camotoy

Assignees
No one assigned
Labels
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.

Send event when Geyser shows other player to client API to Modify Skins Sent to Bedrock Players
3 participants
@rtm516 @Camotoy @onebeastchris