Implement GT's enchantments - #5249
Open
screret wants to merge 33 commits into
Open
Conversation
…sc/use-tags-for-tool-enchantment-checks
…ts instead of hardcoding the enchantment to check
…checks # Conflicts: # src/main/java/com/gregtechceu/gtceu/api/item/tool/ToolHelper.java # src/main/java/com/gregtechceu/gtceu/common/item/tool/ToolEventHandlers.java # src/main/java/com/gregtechceu/gtceu/common/machine/trait/miner/LargeMinerLogic.java # src/main/java/com/gregtechceu/gtceu/data/DataGenerators.java # src/main/java/com/gregtechceu/gtceu/data/tags/EnchantmentTagsLoader.java # src/main/java/com/gregtechceu/gtceu/utils/DummyRecipeLogicMachine.java # src/main/resources/gtceu.mixins.json
# Conflicts: # src/main/java/com/gregtechceu/gtceu/api/item/tool/ToolHelper.java # src/main/java/com/gregtechceu/gtceu/common/machine/trait/miner/LargeMinerLogic.java # src/main/java/com/gregtechceu/gtceu/utils/DummyRecipeLogicMachine.java # src/main/resources/gtceu.mixins.json
…-for-tool-enchantment-checks # Conflicts: # src/main/java/com/gregtechceu/gtceu/api/item/tool/ToolHelper.java
# Conflicts: # src/main/java/com/gregtechceu/gtceu/api/item/tool/ToolHelper.java # src/main/java/com/gregtechceu/gtceu/common/machine/trait/miner/LargeMinerLogic.java
…-for-tool-enchantment-checks # Conflicts: # gradle/forge.versions.toml
# Conflicts: # src/main/java/com/gregtechceu/gtceu/api/item/tool/ToolHelper.java # src/main/java/com/gregtechceu/gtceu/data/DataGenerators.java
…` to match vanilla enchantment provider naming
…vestDrops` so the GLM is the only thing that'll use it
…ons were missing)
…can go in there too
…e might use instead
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
1 participant
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
Implements CEu 1.12's enchantments, Hard Hammer and Disjunction.
TODO add the translation strings (maybe)- I'm not sure if I added those or not
Implementation Details
This PR's code is based on #4494's branch, so that should be merged first.
AI Usage
Outcome
no more "TODO hard hammer enchantment"
also disjunction exists too
How Was This Tested
mined some ore with an enchanted pickaxe. it dropped crushed ore like it should. Also did the same with an actual hammer.
Also punted some endermen with a sword enchanted with Disjunction and checked that they got the correct potion effect(s).
Additional Information
TODO put some screenshots here
Potential Compatibility Issues
CustomTags.IRON_GOLEMSwas renamed toCONSTRUCTSto add a bit of leeway in what can go into the tagCustomTags.SPIDERSwas removed entirely in favor ofEntityTypeTags.ARTHROPOD