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

fix mail for 1.21

Browse source
This commit is contained in:
Chayapak 2024-10-07 13:27:07 +07:00
parent 39477e82c4
commit 85d30b0b14
1 changed files with 25 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main/java/me/chayapak1/chomens_bot/commands/MailCommand.java
View file

@ -16,6 +16,7 @@ import me.chayapak1.chomens_bot.util.PersistentDataUtilities;
import me.chayapak1.chomens_bot.util.UUIDUtilities; import me.chayapak1.chomens_bot.util.UUIDUtilities;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.JoinConfiguration; import net.kyori.adventure.text.JoinConfiguration;
import net.kyori.adventure.text.TextComponent;
import net.kyori.adventure.text.TranslatableComponent; import net.kyori.adventure.text.TranslatableComponent;
import net.kyori.adventure.text.event.HoverEvent; import net.kyori.adventure.text.event.HoverEvent;
import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.NamedTextColor;
@ -80,7 +81,7 @@ public class MailCommand extends Command {
return Component.text("Mail sent!").color(ColorUtilities.getColorByString(bot.config.colorPalette.defaultColor)); return Component.text("Mail sent!").color(ColorUtilities.getColorByString(bot.config.colorPalette.defaultColor));
} }
case "sendselecteditem" -> { case "sendselecteditem" -> {
context.checkOverloadArgs(1); context.checkOverloadArgs(2);
int senderMailsSentTotal = 0; int senderMailsSentTotal = 0;
for (JsonElement mailElement : MailPlugin.mails) { for (JsonElement mailElement : MailPlugin.mails) {
@ -97,7 +98,7 @@ public class MailCommand extends Command {
final CompletableFuture<Component> future = bot.core.runTracked( final CompletableFuture<Component> future = bot.core.runTracked(
"minecraft:data get entity " + "minecraft:data get entity " +
UUIDUtilities.selector(sender.profile.getId()) + UUIDUtilities.selector(sender.profile.getId()) +
" SelectedItem.tag.message" " SelectedItem.components.minecraft:custom_data.message"
); );
if (future == null) { if (future == null) {
@ -105,27 +106,28 @@ public class MailCommand extends Command {
} }
future.thenApply(output -> { future.thenApply(output -> {
try {
final List<Component> children = output.children(); final List<Component> children = output.children();
if ( if (
!children.isEmpty() && !children.isEmpty() &&
!children.get(0).children().isEmpty() && children.get(0).children().isEmpty() &&
((TranslatableComponent) children.get(0).children().get(0)) ((TranslatableComponent) children.get(0)).key()
.key()
.equals("arguments.nbtpath.nothing_found") .equals("arguments.nbtpath.nothing_found")
) { ) {
context.sendOutput(Component.text("Player has no `message` NBT tag in the selected item").color(NamedTextColor.RED)); context.sendOutput(Component.text("Player has no `message` NBT tag in their selected item's minecraft:custom_data").color(NamedTextColor.RED));
return output; return output;
} }
final String value = ComponentUtilities.stringify(((TranslatableComponent) children.get(0)).arguments().get(1).asComponent()); final Component actualOutputComponent = ((TranslatableComponent) output).arguments().get(1).asComponent();
final String value = ComponentUtilities.stringify(actualOutputComponent);
if (!value.startsWith("\"") && !value.endsWith("\"") && !value.startsWith("'") && !value.endsWith("'")) { if (!value.startsWith("\"") && !value.endsWith("\"") && !value.startsWith("'") && !value.endsWith("'")) {
context.sendOutput(Component.text("`message` NBT is not a string").color(NamedTextColor.RED)); context.sendOutput(Component.text("`message` NBT is not a string").color(NamedTextColor.RED));
return output; return output;
} }
try {
bot.mail.send( bot.mail.send(
new Mail( new Mail(
sender.profile.getName(), sender.profile.getName(),
@ -137,6 +139,7 @@ public class MailCommand extends Command {
); );
} catch (CommandException e) { } catch (CommandException e) {
context.sendOutput(e.message.color(NamedTextColor.RED)); context.sendOutput(e.message.color(NamedTextColor.RED));
return output;
} }
context.sendOutput( context.sendOutput(