Skip to content

Support locale retrieval on legacy versions #225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Support locale retrieval on legacy versions #225

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d900696
chore: support locale retrieval on legacy versions
marioded Sep 1, 2025
0cf25c9
fix: ignored handle method
marioded Sep 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions platform-bukkit/src/main/java/net/kyori/adventure/platform/bukkit/BukkitFacet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,11 +421,22 @@ public void contributePointers(final ConsoleCommandSender viewer, final net.kyor
static final class PlayerPointers extends BukkitFacet<Player> implements Facet.Pointers<Player> {

private static final MethodHandle LOCALE_SUPPORTED;
private static final boolean LEGACY;

static {
final MethodHandle asLocale = findMethod(Player.class, "getLocale", Locale.class);
final MethodHandle asString = findMethod(Player.class, "getLocale", String.class);
LOCALE_SUPPORTED = asLocale != null ? asLocale : asString;
boolean legacy = false;
MethodHandle handle = findMethod(Player.class, "getLocale", Locale.class);

if (handle == null) {
handle = findMethod(Player.class, "getLocale", String.class);
if (handle == null) {
handle = findMethod(Player.Spigot.class, "getLocale", String.class);
legacy = true;
}
}

LEGACY = legacy;
LOCALE_SUPPORTED = handle;
}

PlayerPointers() {
Expand All @@ -439,7 +450,8 @@ public void contributePointers(final Player viewer, final net.kyori.adventure.po
builder.withDynamic(Identity.LOCALE, () -> {
if (LOCALE_SUPPORTED != null) {
try {
final Object result = LOCALE_SUPPORTED.invoke(viewer);
final Object target = LEGACY ? viewer.spigot() : viewer;
final Object result = LOCALE_SUPPORTED.invoke(target);
return result instanceof Locale ? (Locale) result : Translator.parseLocale((String) result);
} catch (final Throwable error) {
logError(error, "Failed to call getLocale() for %s", viewer);
Expand Down