Cleanup registry logic and API instances#10742
Merged
Raycoms merged 6 commits intoversion/mainfrom May 11, 2025
Merged
Conversation
Raycoms
reviewed
Apr 14, 2025
|
|
||
| @Override | ||
| public IGlobalResearchTree getGlobalResearchTree() | ||
| public IForgeRegistry<InteractionResponseHandlerEntry> getInteractionResponseHandlerRegistry() |
Contributor
There was a problem hiding this comment.
Please don't re-order these, that's always a nightmare for difs
Raycoms
reviewed
Apr 14, 2025
| } | ||
|
|
||
| @Override | ||
| public IGlobalResearchTree getGlobalResearchTree() |
Contributor
There was a problem hiding this comment.
Not really possible to review what changed here because of the re-ordering too
Contributor
Author
There was a problem hiding this comment.
Nothing changed, the PR does exactly what it means to do, it's a cleanup. I arranged all the different classes along together (data managers, forge registries, custom registries, other classes, etc).
The only other change that's been done there is that the names of the registries were put into reslocs which are shared across the API and the deferred registers, similar to what's been done in 1.21
Raycoms
reviewed
Apr 14, 2025
# Conflicts: # src/main/java/com/minecolonies/core/colony/buildings/workerbuildings/BuildingSmeltery.java
Raycoms
previously approved these changes
May 10, 2025
# Conflicts: # src/main/java/com/minecolonies/api/IMinecoloniesAPI.java # src/main/java/com/minecolonies/api/MinecoloniesAPIProxy.java # src/main/java/com/minecolonies/apiimp/CommonMinecoloniesAPIImpl.java # src/main/java/com/minecolonies/apiimp/initializer/ModResearchCostTypeInitializer.java # src/main/java/com/minecolonies/apiimp/initializer/ModResearchEffectInitializer.java # src/main/java/com/minecolonies/apiimp/initializer/ModResearchRequirementInitializer.java
someaddons
approved these changes
May 11, 2025
Contributor
|
@Thodor12 need 1.21 version |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changes proposed in this pull request
Testing
Review please