Goat horns and item cooldowns for 1.21.2 #5102
Merged
+320
−66
Conversation
This file contains 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
Camotoy
reviewed
Oct 25, 2024
core/src/main/java/org/geysermc/geyser/inventory/item/GeyserInstrument.java
Outdated
Show resolved
Hide resolved
core/src/main/java/org/geysermc/geyser/translator/text/MessageTranslator.java
Outdated
Show resolved
Hide resolved
…nto fork/eclipseisoffline/feature/1.21.2
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.
This PR should handle most of the goat horn changes in 1.21.2. Goat horn instruments have been turned data-driven and this PR takes account for that. This PR should also fix item cooldowns and implement support for tracking cooldown groups in Geyser, although Bedrock still doesn't always support showing custom item cooldowns visually.
Some basic testing has been done, both vanilla- and non-vanilla goat horns seem to translate correctly and have correct their cooldowns applied and sounds played. Some notes:
GeyserInstrumentmay need a better name, butInstrumentconflicts with MCPL.In
JavaCooldownTranslator, it says that(These two being goat horns and shields) is this still the case, or are there now more server-driven item cooldowns for Bedrock?
Non-vanilla goat horns show a double tooltip (see attached screenshot), is it possible to hide the vanilla tooltip or not?
Unrelated to the main topic of this PR, a unnecessary TODO in
Enchantmenthas been removed and a small error in the Javadoc there has been fixed.