-
Notifications
You must be signed in to change notification settings - Fork 328
Unhardcode enchantment checks in tool drop handling #4421
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.
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
Closed
screret
wants to merge
20
commits into
GregTechCEu:1.21
from
screret:sc/unhardcode-tool-drop-handler
Closed
Unhardcode enchantment checks in tool drop handling #4421
screret
wants to merge
20
commits into
GregTechCEu:1.21
from
screret:sc/unhardcode-tool-drop-handler
Conversation
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
…y were leftovers from fabric days)
# Conflicts: # src/main/java/com/gregtechceu/gtceu/api/item/tool/ToolHelper.java
Contributor
|
This PR touches many parts of the codebase and implements multiple separate changes. To make sure code is review-able, please extract individual changes out to either separate commits on this branch that are individually review-able, or separate PRs. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What
The primary purpose of this PR is to unhardcode the enchantment checks in
ToolEventHandler.onHarvestDropsandBlockMixin, as data packs can remove enchantments, which would make GTM crash.I also:
SUPPLIER_prefix fromToolHelper.POWER_UNIT_LV& co.@NotNull/@Nullableannotations I came across.busproperty in@EventBusSubscriber.Implementation Details
For all the applicable cases, I used the same utility function vanilla uses for silk touch:
EnchantmentHelper.hasTag.A tag for enchants that block hammer drop conversion was added for that. Currently, it only contains silk touch.
Outcome
Potential Compatibility Issues
Only compatibility issue is the rename of
ToolHelper.POWER_UNIT_LV,_MV, etc., but that can be resolved easily enough.