diff --git a/src/main/java/com/l2jserver/datapack/custom/service/discord/AbstractCommand.java b/src/main/java/com/l2jserver/datapack/custom/service/discord/AbstractCommand.java index d53eeb37933ffdbdd355966c6c04b29f0b476072..1e7ba5dba09e9eb0fa63c18c3079224cf6da79b0 100644 --- a/src/main/java/com/l2jserver/datapack/custom/service/discord/AbstractCommand.java +++ b/src/main/java/com/l2jserver/datapack/custom/service/discord/AbstractCommand.java @@ -71,7 +71,7 @@ public abstract class AbstractCommand extends ListenerAdapter { // Only Server owner and members with the specified role assigned can execute the command. if ((guildMember == null) || (gameMaster == null) || !guildMember.isOwner() || !guildMember.getRoles().contains(gameMaster)) { eb.setDescription("Only Staff members can use this command!"); - event.getTextChannel().sendMessage(eb.build()).queue(); + event.getTextChannel().sendMessageEmbeds(eb.build()).queue(); event.getMessage().addReaction("\u274C").queue(); return false; } diff --git a/src/main/java/com/l2jserver/datapack/custom/service/discord/DiscordBot.java b/src/main/java/com/l2jserver/datapack/custom/service/discord/DiscordBot.java index f2936e508e891e7bf9e013a05c61dcbd9a69a6cd..479bc2f13f931bf5c22e4c7fad7208839247dc48 100644 --- a/src/main/java/com/l2jserver/datapack/custom/service/discord/DiscordBot.java +++ b/src/main/java/com/l2jserver/datapack/custom/service/discord/DiscordBot.java @@ -103,7 +103,7 @@ public class DiscordBot { public static void sendMessageTo(EmbedBuilder ed, String channelId) { MessageChannel channel = jda.getTextChannelById(channelId); if (channel != null) { - channel.sendMessage(ed.build()).queue(); // this actually sends the information to discord. + channel.sendMessageEmbeds(ed.build()).queue(); // this actually sends the information to discord. } } } diff --git a/src/main/java/com/l2jserver/datapack/custom/service/discord/commands/OnlineCommand.java b/src/main/java/com/l2jserver/datapack/custom/service/discord/commands/OnlineCommand.java index a22f6d47f11b040e3b3a726193351fff65724a98..c7df7658f4eb3b2bb8e192a1bd472e48377b37a8 100644 --- a/src/main/java/com/l2jserver/datapack/custom/service/discord/commands/OnlineCommand.java +++ b/src/main/java/com/l2jserver/datapack/custom/service/discord/commands/OnlineCommand.java @@ -51,7 +51,7 @@ public class OnlineCommand extends AbstractCommand { if (args.length != 1) { eb.setColor(Color.RED); eb.setDescription("Please use the command without any Arguments"); - event.getTextChannel().sendMessage(eb.build()).queue(); + event.getTextChannel().sendMessageEmbeds(eb.build()).queue(); event.getMessage().addReaction("\u274C").queue(); // Bot reacts with X mark. return; } @@ -63,7 +63,7 @@ public class OnlineCommand extends AbstractCommand { eb.addField("Online Players", String.valueOf(playersCount), false); eb.addBlankField(false); eb.addField("Online GM's", String.valueOf(gmCount), false); - event.getChannel().sendMessage(eb.build()).queue(); // this actually sends the information to discord. + event.getChannel().sendMessageEmbeds(eb.build()).queue(); // this actually sends the information to discord. event.getMessage().addReaction("\u2705").queue(); // Bot reacts with check mark. } } diff --git a/src/main/java/com/l2jserver/datapack/custom/service/discord/commands/moderation/AbortCommand.java b/src/main/java/com/l2jserver/datapack/custom/service/discord/commands/moderation/AbortCommand.java index d9afed82f2281cb776ca185f85427a2d840d5dae..cd95d067f486816095321bc607eedcf2031519ec 100644 --- a/src/main/java/com/l2jserver/datapack/custom/service/discord/commands/moderation/AbortCommand.java +++ b/src/main/java/com/l2jserver/datapack/custom/service/discord/commands/moderation/AbortCommand.java @@ -54,7 +54,7 @@ public class AbortCommand extends AbstractCommand { if (args.length != 1) { eb.setDescription("Please use the command without any Arguments"); - event.getTextChannel().sendMessage(eb.build()).queue(); + event.getTextChannel().sendMessageEmbeds(eb.build()).queue(); event.getMessage().addReaction("\u274C").queue(); return; } @@ -63,7 +63,7 @@ public class AbortCommand extends AbstractCommand { String commandName = args[0].substring(discord().getPrefix().length()).toUpperCase(); Shutdown.getInstance().telnetAbort(event.getAuthor().getName()); //Using telnet method. eb.setDescription("GM: {" + gmName + "} issued command. **" + commandName + "** --- Shutdown/Restart Aborted."); - event.getChannel().sendMessage(eb.build()).queue(); + event.getChannel().sendMessageEmbeds(eb.build()).queue(); event.getMessage().addReaction("\u2705").queue(); } } \ No newline at end of file diff --git a/src/main/java/com/l2jserver/datapack/custom/service/discord/commands/moderation/AnnounceCommand.java b/src/main/java/com/l2jserver/datapack/custom/service/discord/commands/moderation/AnnounceCommand.java index f32930813c6a2eff83578f84abab89f446165265..15178b029d3442cd1eb32250a40c3ff2c673ce2d 100644 --- a/src/main/java/com/l2jserver/datapack/custom/service/discord/commands/moderation/AnnounceCommand.java +++ b/src/main/java/com/l2jserver/datapack/custom/service/discord/commands/moderation/AnnounceCommand.java @@ -54,7 +54,7 @@ public class AnnounceCommand extends AbstractCommand { if (args.length <= 2) { eb.setDescription("Wrong Arguments. Please type the message to be sent."); - event.getTextChannel().sendMessage(eb.build()).queue(); + event.getTextChannel().sendMessageEmbeds(eb.build()).queue(); event.getMessage().addReaction("\u274C").queue(); return; } @@ -73,6 +73,6 @@ public class AnnounceCommand extends AbstractCommand { } eb.setDescription("**In game Announcement have been sent**."); event.getMessage().addReaction("\u2705").queue(); - event.getChannel().sendMessage(eb.build()).queue(); + event.getChannel().sendMessageEmbeds(eb.build()).queue(); } } diff --git a/src/main/java/com/l2jserver/datapack/custom/service/discord/commands/moderation/RestartCommand.java b/src/main/java/com/l2jserver/datapack/custom/service/discord/commands/moderation/RestartCommand.java index c1bdc7e5bb4d036e17fd5421490f8a3c017ae8bb..cf5de446932d46fbf440657df60f7699be58cf03 100644 --- a/src/main/java/com/l2jserver/datapack/custom/service/discord/commands/moderation/RestartCommand.java +++ b/src/main/java/com/l2jserver/datapack/custom/service/discord/commands/moderation/RestartCommand.java @@ -54,7 +54,7 @@ public class RestartCommand extends AbstractCommand { if (args.length != 2) { eb.setDescription("Wrong Arguments. Please just provide a number in seconds."); - event.getTextChannel().sendMessage(eb.build()).queue(); + event.getTextChannel().sendMessageEmbeds(eb.build()).queue(); event.getMessage().addReaction("\u274C").queue(); return; } @@ -64,7 +64,7 @@ public class RestartCommand extends AbstractCommand { seconds = Integer.parseInt(args[1]); } catch (NumberFormatException e) { eb.setDescription("Wrong Arguments. Please just provide a number in seconds."); - event.getChannel().sendMessage(eb.build()).queue(); + event.getChannel().sendMessageEmbeds(eb.build()).queue(); event.getMessage().addReaction("\u274C").queue(); return; } @@ -74,7 +74,7 @@ public class RestartCommand extends AbstractCommand { Shutdown.getInstance().startTelnetShutdown(event.getAuthor().getName(), seconds, true); //Using telnet method. eb.setColor(Color.GREEN); eb.setDescription("GM: {" + gmName + "} issued command. **" + commandName + "** in " + seconds + " " + "seconds!"); - event.getChannel().sendMessage(eb.build()).queue(); + event.getChannel().sendMessageEmbeds(eb.build()).queue(); event.getMessage().addReaction("\u2705").queue(); } } \ No newline at end of file diff --git a/src/main/java/com/l2jserver/datapack/custom/service/discord/commands/moderation/ShutdownCommand.java b/src/main/java/com/l2jserver/datapack/custom/service/discord/commands/moderation/ShutdownCommand.java index d84c64cdb55df5ef2b2ceb74d1fb94d48c1be2ed..66820c87aece88f3bf1422623590ddc4df450d20 100644 --- a/src/main/java/com/l2jserver/datapack/custom/service/discord/commands/moderation/ShutdownCommand.java +++ b/src/main/java/com/l2jserver/datapack/custom/service/discord/commands/moderation/ShutdownCommand.java @@ -55,7 +55,7 @@ public class ShutdownCommand extends AbstractCommand { if (args.length != 2) { eb.setColor(Color.RED); eb.setDescription("Wrong Arguments. Please just provide a number in seconds."); - event.getTextChannel().sendMessage(eb.build()).queue(); + event.getTextChannel().sendMessageEmbeds(eb.build()).queue(); event.getMessage().addReaction("\u274C").queue(); return; } @@ -66,7 +66,7 @@ public class ShutdownCommand extends AbstractCommand { } catch (NumberFormatException e) { eb.setColor(Color.RED); eb.setDescription("Wrong Arguments. Please just provide a number in seconds."); - event.getChannel().sendMessage(eb.build()).queue(); + event.getChannel().sendMessageEmbeds(eb.build()).queue(); event.getMessage().addReaction("\u274C").queue(); return; } @@ -75,8 +75,8 @@ public class ShutdownCommand extends AbstractCommand { String commandName = args[0].substring(discord().getPrefix().length()).toUpperCase(); Shutdown.getInstance().startTelnetShutdown(event.getAuthor().getName(), seconds, false); //Using telnet method. eb.setColor(Color.GREEN); - eb.setDescription("GM: {" + gmName + "} issued command. **" + commandName + "** in " + args[1] + " " + "seconds!"); - event.getChannel().sendMessage(eb.build()).queue(); + eb.setDescription("GM: {" + gmName + "} issued command. **" + commandName + "** in " + seconds + " " + "seconds!"); + event.getChannel().sendMessageEmbeds(eb.build()).queue(); event.getMessage().addReaction("\u2705").queue(); } } \ No newline at end of file