Skip to content

Clean-up: remove JAVA_ENTITY_TYPES registry - #6832

Merged
eclipseisoffline merged 3 commits into
GeyserMC:masterfrom
eclipseisoffline:entity-registry-cleanup
Oct 30, 2026
Merged

eclipseisoffline merged 3 commits into
GeyserMC:masterfrom
eclipseisoffline:entity-registry-cleanup

Conversation

@eclipseisoffline

Copy link
Copy Markdown
Member

This PR removes the JAVA_ENTITY_TYPES registry (listed in Registries), as all of its remaining use cases were covered by the modern BuiltInJavaRegistries#ENTITY_TYPE registry. Please note that for this change, some modifications to unit tests were required. The ScoreboardIssueTests unit test class now bootstraps the default (resolvable) data component registries, as well as the BuiltInJavaRegistries. There are some notes on this, see the comments in that class.

The PR also bumps MCPL, which includes GeyserMC/MCProtocolLib#939, which fixes some nullability warnings across the project.

@rtm516 rtm516 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

All looks good. Just a little confused why we have a new GeyserResources class? It nice to split it out of the bootstrap but it feels like an extra class for not alot of use.

@eclipseisoffline

Copy link
Copy Markdown
Member Author

It's used in the ScoreboardIssueTests to bootstrap the data component registries, which require access to resources (mappings). Sorry, this wasn't very clear from the PR description.

@eclipseisoffline
eclipseisoffline merged commit e87ad14 into GeyserMC:master Oct 30, 2026
3 checks passed
SendableMetatype pushed a commit to EduGeyser/EduGeyser that referenced this pull request Oct 30, 2026
* Remove JAVA_ENTITY_TYPES registry as BuiltInJavaRegistries#ENTITY_TYPE fully covers its use case

* Fix tests: bootstrap BuiltInJavaRegistries in ScoreboardIssueTests

* MCPL bump

(cherry picked from commit e87ad14)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants