Full Java tooltip parity (as much as that is possible)#5692
Open
eclipseisoffline wants to merge 20 commits intoGeyserMC:masterfrom
Open
Full Java tooltip parity (as much as that is possible)#5692eclipseisoffline wants to merge 20 commits intoGeyserMC:masterfrom
eclipseisoffline wants to merge 20 commits intoGeyserMC:masterfrom
Conversation
…ps, fix ominous bottle tooltip
Member
onebeastchris
left a comment
There was a problem hiding this comment.
this is another insane PR, the 3rd or 4th registry refactor? xd
I'm sceptical about how useful it is to have occasionally duplicate/conflicting tooltips. Might be worth exploring whether we can use the optional pack to yeet them entirely?
Also, performance of this could be... interesting. Same as maintainability; but with components being now as far as they are I'd assume this wouldn't change too much
Haven't done a proper review yet, mainly because I'd like to test it to see how much this would actually be "confusing"; and to see if there's possibilities to cook with the optional pack!
core/src/main/java/org/geysermc/geyser/item/tooltip/TooltipProviders.java
Outdated
Show resolved
Hide resolved
Comment on lines
+137
to
+140
| // TODO tooltips for default components? | ||
| public static void addNameTooltips(TooltipContext context, DataComponents componentPatch, Consumer<String> adder) { | ||
| // TODO | ||
| } |
Member
There was a problem hiding this comment.
Are these (more or less) already being added by the Bedrock client?
Member
Author
| return is(tag, itemStack.asItem()); | ||
| } | ||
|
|
||
|
|
# Conflicts: # core/src/main/java/org/geysermc/geyser/translator/item/ItemTranslator.java
Open
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
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 intends to fully implement Java tooltip partity, or as much as that is possible.
This PR fixes or will fix the following issues:
minecraft:tropical_fish_patterncomponent only show up on tropical fish buckets.minecraft:instrumentcomponent only show up on goat horns.minecraft:can_place_onandminecraft:can_breakcomponents (new Java parity).... among other issues as well. This PR also adds new functionality to
MinecraftLocale, to load thedeprecated.jsonlanguage file (introduced in Java 1.21.2), which contains removed and replaced language keys, and applies it to loaded locales. This ensures the proper translation keys are resolved.Along with these changes, this PR also refactors the loading of data-driven registries.
JavaRegistryKeys now support parsing and translating MCPL'sHolders to objects loaded by Geyser, when possible. Some refactors to loaded registry objects, such asJukeboxSongandGeyserInstrumenthave also been made, to accommodate for the new way of building tooltips.Of course, this PR also overhauls the building of tooltips in the
ItemTranslatorclass, and spreads this over multiple classes to increase code readability.This PR is still unfinished and there are some things left to do. Here are some things worth noting:
Here are some images to illustrate a couple of the new tooltip changes (left Java, right bedrock. Apologies for the difference in screenshot size):