feat(api): add support for translatable component fallbacks (#863) #868
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
|
How does this interact with 2ed1e7c? |
|
It does not, I didn't see that branch existed :/ |
NoahvdAa
force-pushed
the
feat/translatable-fallback
branch
from
45bef90
to
efac07b
Compare
|
Rebased to include kashike's changes. |
qixils
reviewed
Feb 6, 2023
api/src/main/java/net/kyori/adventure/text/TranslatableComponent.java
Outdated
Show resolved
Hide resolved
Co-authored-by: Lexi <lexi@qixils.dev>
|
Added MiniMessage support. I went with the separate tag route after some discussion on Discord. |
kezz
requested changes
Feb 24, 2023
...src/main/java/net/kyori/adventure/text/minimessage/tag/standard/TranslatableFallbackTag.java
Show resolved
Hide resolved
...zer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ComponentSerializerImpl.java
Show resolved
Hide resolved
kezz
previously requested changes
Feb 28, 2023
api/src/main/java/net/kyori/adventure/text/TranslatableComponent.java
Outdated
Show resolved
Hide resolved
...inimessage/src/main/java/net/kyori/adventure/text/minimessage/tag/standard/StandardTags.java
Outdated
Show resolved
Hide resolved
zml2008
approved these changes
Mar 14, 2023
kashike
approved these changes
Mar 14, 2023
Wirlie
pushed a commit
to Wirlie/Enhanced-Glist
that referenced
this pull request
Mar 28, 2023
[](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---|---|---| | [gradle](https://gradle.org) ([source](https://github.com/gradle/gradle)) | | patch | `7.6` -> `7.6.1` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [org.mockito:mockito-inline](https://github.com/mockito/mockito) | dependencies | minor | `4.10.0` -> `4.11.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [org.mockito:mockito-junit-jupiter](https://github.com/mockito/mockito) | dependencies | minor | `4.10.0` -> `4.11.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [org.mockito:mockito-core](https://github.com/mockito/mockito) | dependencies | minor | `4.10.0` -> `4.11.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [com.github.ben-manes.caffeine:caffeine](https://github.com/ben-manes/caffeine) | dependencies | patch | `3.1.2` -> `3.1.5` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | dev.simplix:protocolize-api | dependencies | patch | `2.2.3` -> `2.2.6` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [io.lettuce:lettuce-core](https://github.com/lettuce-io/lettuce-core) | dependencies | patch | `6.2.2.RELEASE` -> `6.2.3.RELEASE` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [com.google.code.gson:gson](https://github.com/google/gson) | dependencies | patch | `2.10` -> `2.10.1` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [net.kyori:adventure-text-serializer-gson](https://github.com/KyoriPowered/adventure) | dependencies | minor | `4.12.0` -> `4.13.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [net.kyori:adventure-text-serializer-legacy](https://github.com/KyoriPowered/adventure) | dependencies | minor | `4.12.0` -> `4.13.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [net.kyori:adventure-text-minimessage](https://github.com/KyoriPowered/adventure) | dependencies | minor | `4.12.0` -> `4.13.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [net.kyori:adventure-platform-bungeecord](https://github.com/KyoriPowered/adventure-platform) | dependencies | minor | `4.2.0` -> `4.3.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [net.kyori:adventure-api](https://github.com/KyoriPowered/adventure) | dependencies | minor | `4.12.0` -> `4.13.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [net.kyori:adventure-platform-bukkit](https://github.com/KyoriPowered/adventure-platform) | dependencies | minor | `4.2.0` -> `4.3.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | org.jetbrains.kotlin.kapt | plugin | minor | `1.7.22` -> `1.8.10` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | org.jetbrains.kotlin.jvm | plugin | minor | `1.7.22` -> `1.8.10` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>gradle/gradle</summary> ### [`v7.6.1`](https://github.com/gradle/gradle/releases/tag/v7.6.1): 7.6.1 This is a patch release for 7.6. We recommend using 7.6.1 instead of 7.6. It fixes the following issues: - [#​19065](https://github.com/gradle/gradle/issues/19065) Platform dependencies not possible in dependency block of test suite plugin - [#​22688](https://github.com/gradle/gradle/issues/22688) Increased memory usage (with -p option) - [#​22796](https://github.com/gradle/gradle/issues/22796) Building gradle itself fails during toolchain download: permission denied copying a file within `.gradle/jdks` - [#​22875](https://github.com/gradle/gradle/issues/22875) Regression with 7.6: @​pom artifact in JVM library project is no longer found - [#​22937](https://github.com/gradle/gradle/issues/22937) Remove safe credentials reference - [#​22973](https://github.com/gradle/gradle/issues/22973) Kotlin MPP plugin broken with Gradle 7.6 due to signature change in TestResultProcessor - [#​23016](https://github.com/gradle/gradle/issues/23016) toolchainManagement.jvm.javaRepositories should not expose the full surface of NamedDomainObjectList - [#​23025](https://github.com/gradle/gradle/issues/23025) Back-port toolchain related fixes to 7.6.1 - [#​23053](https://github.com/gradle/gradle/issues/23053) Auto-provisioning/auto-detection of IBM Semeru toolchains is broken with Gradle 7.6 - [#​23074](https://github.com/gradle/gradle/issues/23074) Docs: Build Lifecycle starts halfway through a point - [#​23096](https://github.com/gradle/gradle/issues/23096) Classifiers of version catalog are discarded while copied to anothor dependency - [#​23111](https://github.com/gradle/gradle/issues/23111) Ant closures are broken with Gradle 7.6 - [#​23178](https://github.com/gradle/gradle/issues/23178) Mention the Foojay Toolchain Resolver plugin in the Gradle manual - [#​23215](https://github.com/gradle/gradle/issues/23215) Gradle 7.6: high memory usage (android project) - [#​23224](https://github.com/gradle/gradle/issues/23224) Backport to 7.6.1 "Fix for Incremental compilation with modules" - [#​23294](https://github.com/gradle/gradle/issues/23294) "Unable to make progress running work" together with --continue and failing tasks (Backport to 7.6.1) - [#​23555](https://github.com/gradle/gradle/issues/23555) Improve Toolchain related deprecation nagging in 7.6 - [#​23894](https://github.com/gradle/gradle/issues/23894) Update EOL policy - [#​23910](https://github.com/gradle/gradle/issues/23910) Backport trusting only full GPG keys in dependency verification \[Backport 7.6.1] - [#​23941](https://github.com/gradle/gradle/issues/23941) Typo in v7.6 docs about disabling_the_daemon - [#​23985](https://github.com/gradle/gradle/issues/23985) Resolving of manually created configuration creates a ResolveException [Read the Release Notes](https://docs.gradle.org/7.6.1/release-notes.html) #### Upgrade Instructions Switch your build to use Gradle 7.6.1 by updating your wrapper: ./gradlew wrapper --gradle-version=7.6.1 See the [Gradle 7.x upgrade guide](https://docs.gradle.org/7.6.1/userguide/upgrading_version\_7.html#changes\_7.6) to learn about deprecations, breaking changes and other considerations when upgrading to Gradle 7.6.1. #### Reporting Problems If you find a problem with this release, please file a bug on [GitHub Issues](https://github.com/gradle/gradle/issues) adhering to our issue guidelines. If you're not sure you're encountering a bug, please use the [forum](https://discuss.gradle.org/c/help-discuss). </details> <details> <summary>mockito/mockito</summary> ### [`v4.11.0`](https://github.com/mockito/mockito/releases/tag/v4.11.0) <sup><sup>*Changelog generated by [Shipkit Changelog Gradle Plugin](https://github.com/shipkit/shipkit-changelog)*</sup></sup> ##### 4.11.0 - 2022-12-28 - [1 commit(s)](https://github.com/mockito/mockito/compare/v4.10.0...v4.11.0) by Andy Coates - Improve vararg handling: approach 2 [(#​2807)](https://github.com/mockito/mockito/pull/2807) - Mocking varargs method with `any(String[].class)` doesn't work as expected [(#​2796)](https://github.com/mockito/mockito/issues/2796) - (Argument)Matchers regression from 1.10.19 to 2.18.3 for varargs [(#​1498)](https://github.com/mockito/mockito/issues/1498) - Cannot verify varargs parameter as an array [(#​1222)](https://github.com/mockito/mockito/issues/1222) - ArgumentCaptor can't capture varargs-arrays [(#​584)](https://github.com/mockito/mockito/issues/584) - Verification of an empty varargs call fails when isNotNull() is used [(#​567)](https://github.com/mockito/mockito/issues/567) </details> <details> <summary>ben-manes/caffeine</summary> ### [`v3.1.5`](https://github.com/ben-manes/caffeine/releases/tag/v3.1.5): 3.1.5 Cache - Fixed `clear()` removing a key more than once due to a write-back removal listener ([#​872](https://github.com/ben-manes/caffeine/issues/872)) JCache - Added support for loading the configuration from the cache manager's uri ([#​877](https://github.com/ben-manes/caffeine/issues/877)) ### [`v3.1.4`](https://github.com/ben-manes/caffeine/releases/tag/v3.1.4): 3.1.4 Added [@​CanIgnoreReturnValue](https://errorprone.info/bugpattern/CheckReturnValue) annotations for static analysis ([#​868](https://github.com/ben-manes/caffeine/issues/868)) ### [`v3.1.3`](https://github.com/ben-manes/caffeine/releases/tag/v3.1.3): 3.1.3 Cache - Fixed the build time dependency constraints from being leaked into the external metadata ([#​867](https://github.com/ben-manes/caffeine/issues/867)) - Fixed the cause of a removal notification for a discarded refresh when the entry was removed - Fixed the behavior for null lookups into returned unmodifiable maps to be consistent ([#​864](https://github.com/ben-manes/caffeine/issues/864)) - Fixed an unexpected delay of removal notifications when using a scheduler ([#​859](https://github.com/ben-manes/caffeine/issues/859)) - Fixed explicit refreshes from being deduped if the entry is pending eviction - Defaulted methods to [@​CheckReturnValue](https://errorprone.info/bugpattern/CheckReturnValue) for static analysis ([#​863](https://github.com/ben-manes/caffeine/issues/863)) - Reduced the lock hold time during Map.clear ([#​835](https://github.com/ben-manes/caffeine/issues/835)) JCache - Fixed `putAll` with an immutable map that causes an exception when using a cache writer ([#​841](https://github.com/ben-manes/caffeine/issues/841)) </details> <details> <summary>lettuce-io/lettuce-core</summary> ### [`v6.2.3.RELEASE`](https://github.com/lettuce-io/lettuce-core/releases/tag/6.2.3.RELEASE) [Compare Source](https://github.com/lettuce-io/lettuce-core/compare/6.2.2.RELEASE...6.2.3.RELEASE) #### 📗 Links - Reference documentation: https://lettuce.io/core/6.2.3.RELEASE/reference/ - Javadoc: https://lettuce.io/core/6.2.3.RELEASE/api/ #### 🐞 Bug Fixes - Fallback to RESP2 hides potential authentication configuration problems [#​2313](https://github.com/lettuce-io/lettuce-core/issues/2313) - Accept slots as String using `CLUSTER SHARDS` [#​2325](https://github.com/lettuce-io/lettuce-core/issues/2325) - Handle unknown endpoints in MOVED response [#​2290](https://github.com/lettuce-io/lettuce-core/issues/2290) - `RedisURI.applySsl(…)` does not retain `SslVerifyMode` [#​2328](https://github.com/lettuce-io/lettuce-core/issues/2328) - Apply `SslVerifyMode` in `RedisURI.applySsl(…)` [#​2329](https://github.com/lettuce-io/lettuce-core/issues/2329) #### 💡 Other - Avoid using port 7443 in Lettuce tests [#​2326](https://github.com/lettuce-io/lettuce-core/issues/2326) - Update netty.version to 4.1.89.Final [#​2311](https://github.com/lettuce-io/lettuce-core/issues/2311) - Fix duplicate word occurrences [#​2307](https://github.com/lettuce-io/lettuce-core/issues/2307) #### ❤️ Contributors We'd like to thank all the contributors who worked on this release! - [@​Emibergo02](https://github.com/Emibergo02) - [@​jacob-pro](https://github.com/jacob-pro) - [@​liyuntao](https://github.com/liyuntao) - [@​rbowen](https://github.com/rbowen) - [@​rstosick](https://github.com/rstosick) - [@​vijay-kota](https://github.com/vijay-kota) </details> <details> <summary>KyoriPowered/adventure</summary> ### [`v4.13.0`](https://github.com/KyoriPowered/adventure/releases/tag/v4.13.0): 🌏 Adventure 4.13.0 Adventure 4.13.0 is a feature release with several QOL enhancements, support for new 1.19.4 chat component features, and some bug fixes. Happy developing! #### Additions ✨ - Finish adding MM tags for all Vanilla component types by [@​zml2008](https://github.com/zml2008) in [KyoriPowered/adventure#843 - text-minimessage: Add a shortcut for styling tags by [@​JOO200](https://github.com/JOO200) in [KyoriPowered/adventure#858 - text-minimessage: Add a TagResolver for boolean values by [@​JOO200](https://github.com/JOO200) in [KyoriPowered/adventure#857 - feat(api): allow Translators to create their own Components by [@​qixils](https://github.com/qixils) in [KyoriPowered/adventure#871 - feat(api): Add emulated callback click event by [@​zml2008](https://github.com/zml2008) in [KyoriPowered/adventure#860 - feat(api): add support for translatable component fallbacks ([#​863](https://github.com/KyoriPowered/adventure/issues/863)) by [@​NoahvdAa](https://github.com/NoahvdAa) in [KyoriPowered/adventure#868 #### Fixes 🐛 - bug(api): workaround which fixes [#​849](https://github.com/KyoriPowered/adventure/issues/849) by [@​kashike](https://github.com/kashike) in [KyoriPowered/adventure#861 - Make DecorationMap$KeySet and $Values follow Collection::toArray() contract by [@​emilyy-dev](https://github.com/emilyy-dev) in [KyoriPowered/adventure#862 - fix(serializer-gson): Ignore empty hover event values by [@​zml2008](https://github.com/zml2008) in [KyoriPowered/adventure#859 - change minimessage rainbow tag colors by [@​MrKinau](https://github.com/MrKinau) in [KyoriPowered/adventure#882 - bug(minimessage): respect requests to include stacktraces by [@​kashike](https://github.com/kashike) in KyoriPowered/adventure@42ea3df #### New Contributors - [@​neziw](https://github.com/neziw) made their first contribution in [KyoriPowered/adventure#870 - [@​MrKinau](https://github.com/MrKinau) made their first contribution in [KyoriPowered/adventure#882 **Full Changelog**: KyoriPowered/adventure@v4.12.0...v4.13.0 </details> <details> <summary>KyoriPowered/adventure-platform</summary> ### [`v4.3.0`](https://github.com/KyoriPowered/adventure-platform/releases/tag/v4.3.0) This release adds full support for 1.19.4 on the Bukkit platform (though most functionality should work even on 4.2.0). #### What's Changed - fix: 1.19.4 bound chat types by [@​Machine-Maker](https://github.com/Machine-Maker) in [KyoriPowered/adventure-platform#128 #### New Contributors - [@​neziw](https://github.com/neziw) made their first contribution in [KyoriPowered/adventure-platform#124 **Full Changelog**: KyoriPowered/adventure-platform@v4.2.0...v4.3.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/Wirlie/Enhanced-Glist). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC42Ni4wIiwidXBkYXRlZEluVmVyIjoiMzUuOC4zIn0=--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
](https://renovatebot.com){kind=link}
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.
Adds support for the new translatable component fallbacks, as requested in #863.
Wasn't sure what to do for MiniMessage, since adding the fallback string in front would break existing configs, and at the end isn't possible because the tag allows for infinite arguments.
adding the fallback to all the static methods was a pain lol