From 13e04475f02c12dc223c5c4f4fb4e817117e5a9c Mon Sep 17 00:00:00 2001 From: Video Date: Thu, 29 Jul 2021 17:06:31 -0600 Subject: [PATCH] FS-326 & quick formatting fix The formatting of DiscordToMinecraft was adjusted in addition to make it look nicer --- .../discord/DiscordToMinecraftListener.java | 75 ++++++++++--------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/discord/DiscordToMinecraftListener.java b/src/main/java/me/totalfreedom/totalfreedommod/discord/DiscordToMinecraftListener.java index e0f26bff..4d4b9163 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/discord/DiscordToMinecraftListener.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/discord/DiscordToMinecraftListener.java @@ -22,46 +22,47 @@ public class DiscordToMinecraftListener extends ListenerAdapter public void onMessageReceived(MessageReceivedEvent event) { String chat_channel_id = ConfigEntry.DISCORD_CHAT_CHANNEL_ID.getString(); - if (event.getMember() != null && !chat_channel_id.isEmpty() && event.getChannel().getId().equals(chat_channel_id)) + if (event.getMember() != null && !chat_channel_id.isEmpty() + && event.getChannel().getId().equals(chat_channel_id) + && !event.getAuthor().getId().equals(Discord.bot.getSelfUser().getId())) { - if (!event.getAuthor().getId().equals(Discord.bot.getSelfUser().getId())) + Member member = event.getMember(); + String tag = getDisplay(member); + StringBuilder message = new StringBuilder(ChatColor.DARK_GRAY + "[" + ChatColor.DARK_AQUA + "Discord" + + ChatColor.DARK_GRAY + "]"); + Message msg = event.getMessage(); + if (tag != null) { - Member member = event.getMember(); - String tag = getDisplay(member); - StringBuilder message = new StringBuilder(ChatColor.DARK_GRAY + "[" + ChatColor.DARK_AQUA + "Discord" + ChatColor.DARK_GRAY + "]"); - Message msg = event.getMessage(); - if (tag != null) - { - message.append(" ").append(tag); - } - message.append(" ").append(ChatColor.RED).append(ChatColor.stripColor(member.getEffectiveName())).append(ChatColor.DARK_GRAY).append(":").append(ChatColor.RESET); - ComponentBuilder builder = new ComponentBuilder(message.toString()); - if (!msg.getContentDisplay().isEmpty()) - { - builder.append(" ").append(ChatColor.stripColor(msg.getContentDisplay())); - message.append(" ").append(ChatColor.stripColor(msg.getContentDisplay())); // for logging - } - if (!msg.getAttachments().isEmpty()) - { - for (Message.Attachment attachment : msg.getAttachments()) - { - attachment.getUrl(); - builder.append(" "); - TextComponent text = new TextComponent(ChatColor.YELLOW + "[Media]"); - text.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, attachment.getUrl())); - builder.append(text); - message.append(" [Media]"); // for logging - } - } - for (Player player : Bukkit.getOnlinePlayers()) - { - if (TotalFreedomMod.getPlugin().pl.getData(player).doesDisplayDiscord()) - { - player.spigot().sendMessage(builder.create()); - } - } - FLog.info(message.toString()); + message.append(" ").append(tag); } + message.append(" ").append(ChatColor.RED).append(ChatColor.stripColor(member.getEffectiveName())) + .append(ChatColor.DARK_GRAY).append(":").append(ChatColor.RESET); + ComponentBuilder builder = new ComponentBuilder(message.toString()); + if (!msg.getContentDisplay().isEmpty()) + { + builder.append(" ").append(ChatColor.stripColor(msg.getContentDisplay())); + message.append(" ").append(ChatColor.stripColor(msg.getContentDisplay())); // for logging + } + if (!msg.getAttachments().isEmpty()) + { + for (Message.Attachment attachment : msg.getAttachments()) + { + attachment.getUrl(); + builder.append(" "); + TextComponent text = new TextComponent(ChatColor.YELLOW + "[Media]"); + text.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, attachment.getUrl())); + builder.append(text); + message.append(" [Media]"); // for logging + } + } + for (Player player : Bukkit.getOnlinePlayers()) + { + if (TotalFreedomMod.getPlugin().pl.getData(player).doesDisplayDiscord()) + { + player.spigot().sendMessage(builder.create()); + } + } + FLog.info(message.toString()); } }