From 15def7ec16c967402e57caec7740884e5f274966 Mon Sep 17 00:00:00 2001 From: zontreck Date: Wed, 9 Apr 2025 23:55:48 -0700 Subject: [PATCH] Add some nicer formatting to the prefix --- .../java/dev/zontreck/ase/EventsHandler.java | 10 ++++++-- .../ase/commands/CommandRegistry.java | 23 ++++++++++++------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/src/main/java/dev/zontreck/ase/EventsHandler.java b/src/main/java/dev/zontreck/ase/EventsHandler.java index 49b9dd4..b65ec31 100644 --- a/src/main/java/dev/zontreck/ase/EventsHandler.java +++ b/src/main/java/dev/zontreck/ase/EventsHandler.java @@ -16,6 +16,7 @@ import io.papermc.paper.event.player.AsyncChatEvent; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.event.HoverEvent; import net.kyori.adventure.text.format.NamedTextColor; +import net.md_5.bungee.api.ChatColor; public class EventsHandler implements Listener { @@ -53,14 +54,19 @@ public class EventsHandler implements Listener { prefix = ""; } + if (!prefix.isBlank()) { + prefix = ChatColor.YELLOW + "[" + ChatColor.RESET + prefix + ChatColor.YELLOW + "] "; + } + // Build the chat format: [prefix] [nickname/username]: message + // TODO: Implement a GUI color picker for the prefix color, and nickname + // colorizer. Component prefixComponent = Component.text(prefix, NamedTextColor.GRAY); - Component nameComponent = Component.text(nickname, NamedTextColor.YELLOW); + Component nameComponent = Component.text(nickname, NamedTextColor.AQUA); Component colonComponent = Component.text(": ", NamedTextColor.GRAY); Component finalMessage = Component.empty() .append(prefixComponent) - .append(Component.space()) .append(nameComponent) .append(colonComponent) .append(message) diff --git a/src/main/java/dev/zontreck/ase/commands/CommandRegistry.java b/src/main/java/dev/zontreck/ase/commands/CommandRegistry.java index 81d729c..f54ff39 100644 --- a/src/main/java/dev/zontreck/ase/commands/CommandRegistry.java +++ b/src/main/java/dev/zontreck/ase/commands/CommandRegistry.java @@ -217,17 +217,24 @@ public class CommandRegistry { cmds.register(Commands.literal("prefix") .requires(x -> x.getSender().isPermissionSet(PrefixCommand.PERMISSION)) + .executes(ctx -> PrefixCommand.execute(ctx.getSource(), + (Player) ctx.getSource().getSender(), "")) .then(Commands.argument("prefix", StringArgumentType.word()) .executes(ctx -> PrefixCommand.execute(ctx.getSource(), (Player) ctx.getSource().getSender(), - StringArgumentType.getString(ctx, "prefix")))) - .then(Commands.argument("target", ArgumentTypes.player()) - .requires(x -> x.getSender().isOp()) - .executes(ctx -> PrefixCommand.execute(ctx.getSource(), - ctx.getArgument("target", - PlayerSelectorArgumentResolver.class) - .resolve(ctx.getSource()).getFirst(), - StringArgumentType.getString(ctx, "prefix")))) + StringArgumentType.getString(ctx, "prefix"))) + + .then(Commands.argument("target", ArgumentTypes.player()) + .requires(x -> x.getSender().isOp()) + .executes(ctx -> PrefixCommand.execute(ctx.getSource(), + ctx.getArgument("target", + PlayerSelectorArgumentResolver.class) + .resolve(ctx.getSource()) + .getFirst(), + StringArgumentType.getString(ctx, + "prefix")))) + + ) .build()); }