ChomeNS/chomens-bot-java
ChomeNS/chomens-bot-java
5
3
Fork 3
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat: *cb {uuid/username{...}} showing [player] (output)

Browse source
This commit is contained in:
Chayapak 2025-03-19 14:50:29 +07:00
parent 85b394c86d
commit 5fdb86c81c
Signed by: ChomeNS
SSH key fingerprint: SHA256:0YoxhdyXsgbc0nfeB2N6FYE60mxMU7DS4uCUMaw2mvA
2 changed files with 42 additions and 7 deletions
build-number.txt
src/main/java/me/chayapak1/chomens_bot/commands
CommandBlockCommand.java

2
build-number.txt
View file

@ -1 +1 @@
1954 1977

47
src/main/java/me/chayapak1/chomens_bot/commands/CommandBlockCommand.java
View file

@ -6,7 +6,11 @@ import me.chayapak1.chomens_bot.command.CommandContext;
import me.chayapak1.chomens_bot.command.CommandException; import me.chayapak1.chomens_bot.command.CommandException;
import me.chayapak1.chomens_bot.command.TrustLevel; import me.chayapak1.chomens_bot.command.TrustLevel;
import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.data.player.PlayerEntry;
import me.chayapak1.chomens_bot.util.ColorUtilities;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.event.ClickEvent;
import net.kyori.adventure.text.event.HoverEvent;
import net.kyori.adventure.text.format.NamedTextColor;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.regex.Matcher; import java.util.regex.Matcher;
@ -38,12 +42,12 @@ public class CommandBlockCommand extends Command {
public Component execute(CommandContext context) throws CommandException { public Component execute(CommandContext context) throws CommandException {
final Bot bot = context.bot; final Bot bot = context.bot;
runCommand(bot, context, context.getString(true, true)); runCommand(bot, context, context.getString(true, true), null);
return null; return null;
} }
private void runCommand (Bot bot, CommandContext context, String command) { private void runCommand (Bot bot, CommandContext context, String command, PlayerEntry player) {
final Matcher userMatcher = USER_PATTERN.matcher(command); final Matcher userMatcher = USER_PATTERN.matcher(command);
final Matcher uuidMatcher = UUID_PATTERN.matcher(command); final Matcher uuidMatcher = UUID_PATTERN.matcher(command);
@ -77,7 +81,7 @@ public class CommandBlockCommand extends Command {
!USER_PATTERN.matcher(username).find() && !USER_PATTERN.matcher(username).find() &&
!UUID_PATTERN.matcher(username).find() !UUID_PATTERN.matcher(username).find()
) { ) {
runCommand(bot, context, replacedCommand); runCommand(bot, context, replacedCommand, entry);
} }
} }
} else if (command.contains("{username}") || command.contains("{uuid}")) { } else if (command.contains("{username}") || command.contains("{uuid}")) {
@ -91,11 +95,11 @@ public class CommandBlockCommand extends Command {
if ( if (
!replacedCommand.contains("{username}") && !replacedCommand.contains("{username}") &&
!replacedCommand.contains("{Uuuid}") && !replacedCommand.contains("{uuid}") &&
!USER_PATTERN.matcher(username).find() && !USER_PATTERN.matcher(username).find() &&
!UUID_PATTERN.matcher(username).find() !UUID_PATTERN.matcher(username).find()
) { ) {
runCommand(bot, context, replacedCommand); runCommand(bot, context, replacedCommand, entry);
} }
} }
} else { } else {
@ -104,7 +108,38 @@ public class CommandBlockCommand extends Command {
if (future == null) return; if (future == null) return;
future.thenApplyAsync(output -> { future.thenApplyAsync(output -> {
context.sendOutput(output); if (player == null) context.sendOutput(output);
else {
final Component component = Component
.translatable(
"[%s] %s",
Component
.text(player.profile.getName())
.color(NamedTextColor.GRAY)
.hoverEvent(
HoverEvent.showText(
Component
.text(player.profile.getName())
.append(Component.newline())
.append(
Component
.text(player.profile.getIdAsString())
.color(ColorUtilities.getColorByString(bot.config.colorPalette.uuid))
)
.append(Component.newline())
.append(Component.text("Click to copy the username to your clipboard").color(NamedTextColor.GREEN))
.append(Component.newline())
.append(Component.text("Shift+Click to insert the UUID into your chat box").color(NamedTextColor.GREEN))
)
)
.clickEvent(ClickEvent.copyToClipboard(player.profile.getName()))
.insertion(player.profile.getIdAsString()),
output.color(NamedTextColor.WHITE)
)
.color(NamedTextColor.DARK_GRAY);
context.sendOutput(component);
}
return output; return output;
}); });