Fix plural identification for class infos in patterns. #7304
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
Moderocky
added
bug
Moderocky
requested review from
TheBentoBox,
sovdeeth,
Pikachu920,
APickledWalrus,
Efnilite and
erenkarakal
Moderocky
commented
Dec 23, 2024
Comment on lines
295
to
330
| if (word.isEmpty()) | ||
| return new NonNullPair<>("", Boolean.FALSE); | ||
| return new NonNullPair<>("", false); | ||
| if (!couldBeSingular(word)) { | ||
| for (final WordEnding ending : plurals) { | ||
| if (ending.isCompleteWord()) { | ||
| // Complete words shouldn't be used as partial pieces | ||
| if (word.length() != ending.plural().length()) | ||
| continue; | ||
| } | ||
| if (word.endsWith(ending.plural())) | ||
| return new NonNullPair<>( | ||
| word.substring(0, word.length() - ending.plural().length()) + ending.singular(), | ||
| true | ||
| ); | ||
| if (word.endsWith(ending.plural().toUpperCase(Locale.ENGLISH))) | ||
| return new NonNullPair<>( | ||
| word.substring(0, word.length() - ending.plural().length()) | ||
| + ending.singular().toUpperCase(Locale.ENGLISH), | ||
| true | ||
| ); | ||
| } | ||
| } | ||
| return new NonNullPair<>(word, false); | ||
| } | ||
|
|
||
| private static boolean couldBeSingular(String word) {//todo | ||
| for (final WordEnding ending : plurals) { | ||
| if (word.endsWith(ending.plural())) | ||
| return new NonNullPair<>(word.substring(0, word.length() - ending.plural().length()) + ending.singular(), Boolean.TRUE); | ||
| if (word.endsWith(ending.plural().toUpperCase(Locale.ENGLISH))) | ||
| return new NonNullPair<>(word.substring(0, word.length() - ending.plural().length()) + ending.singular().toUpperCase(Locale.ENGLISH), Boolean.TRUE); | ||
| if (ending.singular().isBlank()) | ||
| continue; | ||
| if (ending.isCompleteWord() && ending.singular().length() != word.length()) | ||
| continue; // Skip complete words | ||
|
|
||
| if (word.endsWith(ending.singular()) || word.toLowerCase().endsWith(ending.singular())) { | ||
| return true; | ||
| } | ||
| } |
There was a problem hiding this comment.
Git chose an insane way to diff this. It's two separate methods, in case that isn't clear.
TheAbsolutionism
approved these changes
Dec 23, 2024
|
Though it looks good, iirc when I did my testing, it only actually threw the exception/error when calling the element and not just by registering it. Edit: nvm lol |
Efnilite
approved these changes
Dec 23, 2024
sovdeeth
approved these changes
Dec 26, 2024
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.
Description
A follow-up to this fix.
This makes plural detection first check if the word could be singular.
Words like
guialready had correct plural forms (-ui->-uis), but when plurality was checked, the singular was identified as a plural because it matched the-iplural ending.Now, it will check if it matches a singular pattern before checking if it matches a plural pattern.
Note: it is possible this may break some obscure word (that looks like the singular form of another word) but none of the existing class infos break, so I'm assuming it's probably fine.
This also adds a special method for addons to register specific word overrides, so if there are any future problems, they can be fixed specifically with
Utils.addPluralOverride("foot", "feet")(for example).This uses a special 'complete word' mode to make sure that specific overrides won't interfere with any existing plural endings.
I also made some corrections to annoying
-vesendings (wolves, shelves, calves etc.).Target Minecraft Versions: any
Requirements: none
Related Issues: #6982, fixes #7253