Use AudienceLocaleExtractor

jpenilla · Feb 16, 2024 · e81aea1 · e81aea1
1 parent e8c7f5d
commit e81aea1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -44,8 +44,9 @@ dependencies {
     implementation(platform("org.incendo:cloud-minecraft-bom:2.0.0-beta.3"))
     implementation("org.incendo:cloud-paper")
     implementation("org.incendo:cloud-minecraft-extras")
-    implementation("org.incendo:cloud-translations-bukkit:1.0.0-SNAPSHOT")
-    implementation("org.incendo:cloud-translations-minecraft-extras:1.0.0-SNAPSHOT")
+    implementation(platform("org.incendo:cloud-translations-bom:1.0.0-SNAPSHOT"))
+    implementation("org.incendo:cloud-translations-bukkit")
+    implementation("org.incendo:cloud-translations-minecraft-extras")
 
     implementation("org.incendo.interfaces", "interfaces-paper", "1.0.0-SNAPSHOT")
 

diff --git a/src/main/java/xyz/jpenilla/wanderingtrades/command/Commands.java b/src/main/java/xyz/jpenilla/wanderingtrades/command/Commands.java
@@ -4,9 +4,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import net.kyori.adventure.identity.Identity;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.framework.qual.DefaultQualifier;
 import org.incendo.cloud.Command;
@@ -29,6 +27,7 @@
 
 import static org.incendo.cloud.translations.TranslationBundle.core;
 import static org.incendo.cloud.translations.bukkit.BukkitTranslationBundle.bukkit;
+import static org.incendo.cloud.translations.minecraft.extras.AudienceLocaleExtractor.audienceLocaleExtractor;
 import static org.incendo.cloud.translations.minecraft.extras.MinecraftExtrasTranslationBundle.minecraftExtras;
 
 @DefaultQualifier(NonNull.class)
@@ -72,9 +71,7 @@ public CommandManager<CommandSender> commandManager() {
     }
 
     private void registerCaptions() {
-        final LocaleExtractor<CommandSender> extractor = LocaleExtractor.<CommandSender>builder()
-            .senderType(Player.class, player -> this.plugin.audiences().player(player).get(Identity.LOCALE).orElse(null))
-            .build();
+        final LocaleExtractor<CommandSender> extractor = audienceLocaleExtractor(this.plugin.audiences()::sender);
         this.commandManager.captionRegistry()
             .registerProvider(minecraftExtras(extractor))
             .registerProvider(bukkit(extractor))