Support minimessage in horse names

Rokucraft · Apr 3, 2024 · 54dd746 · 54dd746
1 parent 65c10d5
commit 54dd746
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/java/com/rokucraft/rokuhorses/command/commands/EditCommand.java b/src/main/java/com/rokucraft/rokuhorses/command/commands/EditCommand.java
@@ -2,7 +2,6 @@
 
 import com.rokucraft.rokuhorses.command.RokuHorsesCommand;
 import com.rokucraft.rokuhorses.horses.HorseManager;
-import net.kyori.adventure.text.Component;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Horse;
@@ -11,6 +10,7 @@
 import javax.inject.Inject;
 import java.util.Optional;
 
+import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage;
 import static org.incendo.cloud.bukkit.parser.OfflinePlayerParser.offlinePlayerParser;
 import static org.incendo.cloud.parser.standard.EnumParser.enumParser;
 import static org.incendo.cloud.parser.standard.StringParser.greedyStringParser;
@@ -80,7 +80,7 @@ public void init(CommandManager<CommandSender> manager) {
                                             ctx.sender().sendMessage("This player does not have a horse.");
                                             return;
                                         }
-                                        horse.name(name.map(Component::text).orElse(null));
+                                        horse.name(name.map(miniMessage()::deserialize).orElse(null));
                                         horseManager.save(horse);
                                     }
                             );

diff --git a/src/main/java/com/rokucraft/rokuhorses/command/commands/NameCommand.java b/src/main/java/com/rokucraft/rokuhorses/command/commands/NameCommand.java
@@ -13,6 +13,7 @@
 import java.util.Optional;
 
 import static net.kyori.adventure.text.Component.text;
+import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage;
 import static org.incendo.cloud.parser.standard.StringParser.greedyStringParser;
 
 public class NameCommand implements RokuHorsesCommand {
@@ -34,7 +35,7 @@ public void init(CommandManager<CommandSender> manager) {
                         .handler(ctx -> {
                             Optional<String> name = ctx.optional("name");
                             Player player = ctx.sender();
-                            renameHorse(player, name.map(Component::text).orElse(null));
+                            renameHorse(player, name.map(miniMessage()::deserialize).orElse(null));
                         }));
     }