update mcprotocollib + replace deprecated methods

build.gradle

@@ -23,7 +23,7 @@ dependencies {
     implementation 'club.minnced:discord-webhooks:0.5.7'
     implementation  'ch.qos.logback:logback-classic:1.2.3'
     implementation  group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
-    implementation 'com.github.Steveice10:MCProtocolLib:bf0a6be'
+    implementation 'com.github.Steveice10:MCProtocolLib:c5e4b66'
     implementation  group: 'mysql', name: 'mysql-connector-java', version: '5.1.13'
     implementation group: 'org.codehaus.groovy', name: 'groovy-jsr223', version: '3.0.8'
 }

src/main/java/com/diamondfire/helpbot/bot/command/impl/codeblock/AbstractSingleQueryCommand.java

@@ -59,7 +59,7 @@ public static void sendMultipleMessage(List<CodeObject> actions, TextChannel cha
             }
         }
 
-        channel.sendMessage(preset.getEmbed().build()).setActionRows(Util.of(buttons)).queue((message) -> {
+        channel.sendMessageEmbeds(preset.getEmbed().build()).setActionRows(Util.of(buttons)).queue((message) -> {
             ButtonHandler.addListener(userToWait, message, (event) -> {
                 message.delete().queue();
 

src/main/java/com/diamondfire/helpbot/bot/command/impl/codeblock/CodeCommand.java

@@ -21,10 +21,10 @@ public static <T extends CodeObject> void sendHelpMessage(T data, TextChannel ch
         if (customHead == null) {
             File actionIcon = Util.fetchMinecraftTextureFile(data.getItem().getMaterial().toUpperCase());
             builder.setThumbnail("attachment://" + actionIcon.getName());
-            channel.sendMessage(builder.build()).addFile(actionIcon).queue();
+            channel.sendMessageEmbeds(builder.build()).addFile(actionIcon).queue();
         } else {
             builder.setThumbnail(customHead);
-            channel.sendMessage(builder.build()).queue();
+            channel.sendMessageEmbeds(builder.build()).queue();
         }
 
     }

src/main/java/com/diamondfire/helpbot/bot/command/impl/codeblock/TagsCommand.java

@@ -26,14 +26,14 @@ private static void sendTagMessage(CodeObject data, TextChannel channel) {
         } else {
             builder.setTitle("Invalid data!");
             builder.setDescription("What you have searched for is not a valid action!");
-            channel.sendMessage(builder.build()).queue();
+            channel.sendMessageEmbeds(builder.build()).queue();
             return;
         }
 
         if (actionData.getTags().length == 0) {
             builder.setTitle("No tags!");
             builder.setDescription("This action does not contain any tags!");
-            channel.sendMessage(builder.build()).queue();
+            channel.sendMessageEmbeds(builder.build()).queue();
             return;
         }
 
@@ -52,10 +52,10 @@ private static void sendTagMessage(CodeObject data, TextChannel channel) {
         if (customHead == null) {
             File actionIcon = Util.fetchMinecraftTextureFile(data.getItem().getMaterial().toUpperCase());
             builder.setThumbnail("attachment://" + actionIcon.getName());
-            channel.sendMessage(builder.build()).addFile(actionIcon).queue();
+            channel.sendMessageEmbeds(builder.build()).addFile(actionIcon).queue();
         } else {
             builder.setThumbnail(customHead);
-            channel.sendMessage(builder.build()).queue();
+            channel.sendMessageEmbeds(builder.build()).queue();
         }
     }
 

src/main/java/com/diamondfire/helpbot/bot/command/impl/other/StoreCommand.java

@@ -80,7 +80,7 @@ public void run(CommandEvent event) {
             }
             builder.addField(":partying_face: Recent Purchases", String.join("\n", fieldval), false);
 
-            event.getChannel().sendMessage(builder.build()).queue();
+            event.getChannel().sendMessageEmbeds(builder.build()).queue();
         }catch(Exception e) {
             event.reply(new PresetBuilder().withPreset(new InformativeReply(InformativeReplyType.ERROR, "Failed to retrieve store items.")));
         }

src/main/java/com/diamondfire/helpbot/bot/command/impl/other/dev/EvalCommand.java

@@ -64,7 +64,7 @@ public void run(CommandEvent event) {
             builder.setTitle("No.");
             builder.setColor(Color.red);
 
-            event.getChannel().sendMessage(builder.build()).queue();
+            event.getChannel().sendMessageEmbeds(builder.build()).queue();
             return;
         }
 
@@ -83,15 +83,15 @@ public void run(CommandEvent event) {
 
             builder.setTitle("Eval Result");
             builder.addField("Object Returned:", String.format("```js\n%s```", EmbedUtil.fieldSafe(object)), false);
-            event.getChannel().sendMessage(builder.build()).queue();
+            event.getChannel().sendMessageEmbeds(builder.build()).queue();
 
         } catch (Throwable e) {
             StringWriter sw = new StringWriter();
             e.printStackTrace(new PrintWriter(sw));
             String sStackTrace = sw.toString();
 
             builder.setTitle("Eval failed!");
-            event.getChannel().sendMessage(builder.build()).queue();
+            event.getChannel().sendMessageEmbeds(builder.build()).queue();
             event.getChannel().sendMessage(String.format("```%s```", sStackTrace.length() >= 1500 ? sStackTrace.substring(0, 1500) : sStackTrace)).queue();
         }
 

src/main/java/com/diamondfire/helpbot/bot/command/impl/other/dev/FetchDataCommand.java

@@ -11,14 +11,14 @@
 import com.diamondfire.helpbot.sys.externalfile.ExternalFiles;
 import com.diamondfire.helpbot.util.PlainComponentSerializer;
 import com.github.steveice10.mc.auth.exception.request.RequestException;
+import com.github.steveice10.mc.auth.service.AuthenticationService;
 import com.github.steveice10.mc.protocol.MinecraftProtocol;
 import com.github.steveice10.mc.protocol.data.game.MessageType;
 import com.github.steveice10.mc.protocol.packet.ingame.client.ClientChatPacket;
 import com.github.steveice10.mc.protocol.packet.ingame.server.*;
-import com.github.steveice10.packetlib.*;
 import com.github.steveice10.packetlib.event.session.*;
 import com.github.steveice10.packetlib.packet.Packet;
-import com.github.steveice10.packetlib.tcp.TcpSessionFactory;
+import com.github.steveice10.packetlib.tcp.TcpClientSession;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.*;
 
@@ -67,7 +67,7 @@ public void setup(TextChannel channel) {
         builder.setTitle("Fetching Code Database...");
         builder.setDescription("Please wait a moment!");
 
-        Message sentMessage = channel.sendMessage(builder.build()).complete();
+        Message sentMessage = channel.sendMessageEmbeds(builder.build()).complete();
 
         try {
             start(sentMessage);
@@ -108,15 +108,19 @@ public void setup(TextChannel channel) {
     }
 
     private void start(Message message) throws RequestException {
-        MinecraftProtocol protocol = new MinecraftProtocol(USERNAME, PASSWORD);
-        Client client = new Client("beta.mcdiamondfire.com", 25565, protocol, new TcpSessionFactory());
-        Session session = client.getSession();
+        AuthenticationService authService = new AuthenticationService();
+        authService.setUsername(USERNAME);
+        authService.setPassword(PASSWORD);
+        authService.login();
+
+        MinecraftProtocol protocol = new MinecraftProtocol(authService.getSelectedProfile(), authService.getAccessToken());
+        TcpClientSession client = new TcpClientSession("beta.mcdiamondfire.com", 25565, protocol);
 
         status(message, "Connecting to DiamondFire...");
         ready = false;
 
-        client.getSession().connect();
-        client.getSession().addListener(new SessionAdapter() {
+        client.connect();
+        client.addListener(new SessionAdapter() {
             @Override
             public void packetReceived(PacketReceivedEvent event) {
                 Packet packet = event.getPacket();
@@ -146,7 +150,7 @@ public void packetReceived(PacketReceivedEvent event) {
                         status(message, "Receiving data...");
                         ready = true;
                     } else if (text.startsWith("}")) {
-                        session.disconnect("HelpBot data collection has concluded. ");
+                        client.disconnect("HelpBot data collection has concluded. ");
                     }
 
                     if (ready) {
@@ -157,7 +161,7 @@ public void packetReceived(PacketReceivedEvent event) {
             }
         });
 
-        while (session.isConnected()) {
+        while (client.isConnected()) {
             try {
                 Thread.sleep(1);
             } catch (Exception ignored) {
@@ -174,15 +178,15 @@ private void error(Message message, Exception e) {
         EmbedBuilder builder = new EmbedBuilder();
         builder.setTitle("Error occurred!");
         builder.setDescription(e.getMessage());
-        message.editMessage(builder.build()).queue();
+        message.editMessageEmbeds(builder.build()).queue();
         e.printStackTrace();
     }
 
     private void status(Message message, String status) {
         EmbedBuilder builder = new EmbedBuilder();
         builder.setTitle("Status");
         builder.setDescription(status);
-        message.editMessage(builder.build()).queue();
+        message.editMessageEmbeds(builder.build()).queue();
     }
 
 }

src/main/java/com/diamondfire/helpbot/bot/command/impl/other/dev/QueryCommand.java

@@ -82,7 +82,7 @@ public void run(CommandEvent event) {
             e.printStackTrace(new PrintWriter(sw));
             String sStackTrace = sw.toString();
             builder.setTitle("Query failed! " + e.getClass().getName());
-            event.getChannel().sendMessage(builder.build()).queue();
+            event.getChannel().sendMessageEmbeds(builder.build()).queue();
             event.getChannel().sendMessage(String.format("```%s```", sStackTrace.length() >= 1500 ? sStackTrace.substring(0, 1500) : sStackTrace)).queue();
         }
 

src/main/java/com/diamondfire/helpbot/bot/command/impl/other/dev/RestartCommand.java

@@ -43,7 +43,7 @@ public void run(CommandEvent event) {
         builder.setTitle("Restarting!");
         builder.setDescription("This may take a moment");
 
-        event.getChannel().sendMessage(builder.build()).queue((msg) -> {
+        event.getChannel().sendMessageEmbeds(builder.build()).queue((msg) -> {
             RestartHandler.logRestart(msg);
             System.exit(0);
         });

src/main/java/com/diamondfire/helpbot/bot/command/impl/other/dumps/ImageDumpCommand.java

@@ -50,7 +50,7 @@ public void run(CommandEvent event) {
             } catch (IOException e) {
                 PresetBuilder builderError = new PresetBuilder();
                 builder.withPreset(new InformativeReply(InformativeReplyType.ERROR, "Failed to send zip file."));
-                msg.editMessage(builderError.getEmbed().build()).queue();
+                msg.editMessageEmbeds(builderError.getEmbed().build()).queue();
             }
         });
 

src/main/java/com/diamondfire/helpbot/bot/command/impl/other/fun/EightBallCommand.java

@@ -72,7 +72,7 @@ public void run(CommandEvent event) {
         builder.setTitle(":8ball: | " + event.getArgument("question"));
         builder.setDescription(responses[rdm.nextInt(responses.length)]);
 
-        event.getChannel().sendMessage(builder.build()).queue();
+        event.getChannel().sendMessageEmbeds(builder.build()).queue();
     }
 
 }

src/main/java/com/diamondfire/helpbot/bot/command/impl/other/fun/GarfieldCommand.java

@@ -57,7 +57,7 @@ public void run(CommandEvent event) {
             builder.setTitle(":rotating_light: API BROKE :rotating_light:");
             builder.setDescription("DM: <@223518178100248576>\nPING: <@223518178100248576>");
         }
-        event.getChannel().sendMessage(builder.build()).queue();
+        event.getChannel().sendMessageEmbeds(builder.build()).queue();
     }
 
 }

src/main/java/com/diamondfire/helpbot/bot/command/impl/other/fun/IdeaCommand.java

@@ -237,7 +237,7 @@ public void run(CommandEvent event) {
         builder.setTitle("Idea");
         builder.setDescription(types[rdm.nextInt(types.length)] + " " + objectives[rdm.nextInt(objectives.length)] + " " + rewards[rdm.nextInt(rewards.length)]);
 
-        event.getChannel().sendMessage(builder.build()).queue();
+        event.getChannel().sendMessageEmbeds(builder.build()).queue();
     }
 
 }

src/main/java/com/diamondfire/helpbot/bot/command/impl/other/fun/NbsCommand.java

@@ -72,7 +72,7 @@ public void run(CommandEvent event) {
                             .addField("Link: __Expires in 2 minutes__","[Template Link](https://derpystuff.gitlab.io/code/l?link=" + json.get("link").getAsString() + ")",false)
                             .addField("Info:","Click the link shown above and click the button in the bottom left corner to copy the give command for the template. You will need [this function](https://derpystuff.gitlab.io/code/l?link=7cf5d91c35bbde31c28567d8d8945c40) to play songs.",false);
 
-                    channel.sendMessage(embed.build()).queue();
+                    channel.sendMessageEmbeds(embed.build()).queue();
                 } catch(OutdatedNBSException | IOException e) {
                     e.printStackTrace();
                     event.reply(error);

src/main/java/com/diamondfire/helpbot/bot/command/impl/other/fun/SamQuotesCommand.java

@@ -66,7 +66,7 @@ public void run(CommandEvent event) {
             builder.setImage("attachment://quote.png");
             builder.setColor(new Color(87, 177, 71));
 
-            event.getChannel().sendMessage(builder.build()).addFile(file, "quote.png").queue();
+            event.getChannel().sendMessageEmbeds(builder.build()).addFile(file, "quote.png").queue();
 
         } else if (event.getArgument("action").equals("submit")) {
 
@@ -440,7 +440,7 @@ public void run(CommandEvent event) {
             builder.setImage("attachment://quote.png");
             builder.setColor(new Color(87, 177, 71));
 
-            event.getChannel().sendMessage(builder.build()).addFile(samQuote, "quote.png").queue();
+            event.getChannel().sendMessageEmbeds(builder.build()).addFile(samQuote, "quote.png").queue();
 
         } else if (event.getArgument("action").equals("reload")) {
 
@@ -459,7 +459,7 @@ public void run(CommandEvent event) {
             builder.setDescription("" + strings.length);
             builder.setColor(new Color(87, 177, 71));
 
-            event.getChannel().sendMessage(builder.build()).queue();
+            event.getChannel().sendMessageEmbeds(builder.build()).queue();
 
         } else {
 
@@ -470,7 +470,7 @@ public void run(CommandEvent event) {
             builder.setImage("attachment://quote.png");
             builder.setColor(new Color(87, 177, 71));
 
-            event.getChannel().sendMessage(builder.build()).addFile(file, "quote.png").queue();
+            event.getChannel().sendMessageEmbeds(builder.build()).addFile(file, "quote.png").queue();
 
         }
 

src/main/java/com/diamondfire/helpbot/bot/command/impl/other/info/HelpCommand.java

@@ -108,7 +108,7 @@ public void run(CommandEvent event) {
             builder.addField("Category", context.getCommandCategory().toString(), true);
             builder.addField("Role Required", String.format("<@&%s>", command.getPermission().getRole()), true);
 
-            event.getChannel().sendMessage(builder.build()).queue();
+            event.getChannel().sendMessageEmbeds(builder.build()).queue();
         }
 
     }

src/main/java/com/diamondfire/helpbot/bot/command/impl/other/util/AbstractFileListCommand.java

@@ -39,7 +39,7 @@ protected void generate(CommandEvent event, List<? extends CodeObject> data) {
         } catch (IOException e) {
             EmbedBuilder builder = new EmbedBuilder();
             builder.setTitle("Could not generate file!");
-            event.getChannel().sendMessage(builder.build()).queue();
+            event.getChannel().sendMessageEmbeds(builder.build()).queue();
             return;
         }
 

src/main/java/com/diamondfire/helpbot/bot/command/impl/other/util/PollCommand.java

@@ -99,7 +99,7 @@ public void run(CommandEvent event) {
         builder.setDescription(String.join(" ", fullPollOptions)); //adds poll options
         builder.setColor(new Color(33, 40, 97));
 
-        event.getChannel().sendMessage(builder.build()).queue((message) -> { //send embed message
+        event.getChannel().sendMessageEmbeds(builder.build()).queue((message) -> { //send embed message
 
             //add reactions
             Deque<String> nums = Util.getUnicodeNumbers();

src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/individualized/HistoryCommand.java

@@ -183,6 +183,3 @@ protected void execute(CommandEvent event, Player player) {
     }
 
 }
-
-
-

src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/metrics/JoinsCommand.java

@@ -43,6 +43,6 @@ public void run(CommandEvent event) {
                     builder.setDescription(String.format("A total of %s players have joined DiamondFire before!", count));
                 });
 
-        event.getChannel().sendMessage(builder.build()).queue();
+        event.getChannel().sendMessageEmbeds(builder.build()).queue();
     }
 }

src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/FindSupporteeNamesCommand.java

@@ -131,7 +131,7 @@ protected void execute(CommandEvent event, Player player) {
                 builder.getEmbed().addField("", "Player hasn't been helped by anybody!", false);
             }
 
-            msg.editMessage(builder.getEmbed().build()).override(true).queue();
+            msg.editMessageEmbeds(builder.getEmbed().build()).override(true).queue();
         });
     }
 

src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/TotalStatsCommand.java

@@ -137,7 +137,7 @@ public void run(CommandEvent event) {
 
                     });
 
-            msg.editMessage(embed.build()).queue();
+            msg.editMessageEmbeds(embed.build()).queue();
         });
 
     }

src/main/java/com/diamondfire/helpbot/bot/command/reply/ReplyHandler.java

@@ -45,7 +45,7 @@ public MessageAction replyA(PresetBuilder preset, MessageChannel channel) {
     }
 
     public MessageAction embedReply(EmbedBuilder embed, MessageChannel channel) {
-        return channel.sendMessage(embed.build());
+        return channel.sendMessageEmbeds(embed.build());
     }
 
     public MessageAction textReply(String msg, MessageChannel channel) {

src/main/java/com/diamondfire/helpbot/sys/multiselector/MultiSelector.java

@@ -42,10 +42,10 @@ public void send(JDA jda) {
             buttons.add(button);
         }
 
-        jda.getTextChannelById(channel).sendMessage(pages[0].getPage().build()).setActionRows(Util.of(buttons)).queue((message) -> {
+        jda.getTextChannelById(channel).sendMessageEmbeds(pages[0].getPage().build()).setActionRows(Util.of(buttons)).queue((message) -> {
             ButtonHandler.addListener(user, message, event -> {
                 event.deferEdit().queue();
-                message.editMessage(pageMap.get(event.getComponentId()).getPage().build()).setActionRows(message.getActionRows()).queue();
+                message.editMessageEmbeds(pageMap.get(event.getComponentId()).getPage().build()).setActionRows(message.getActionRows()).queue();
             }, true);
         });
     }

src/main/java/com/diamondfire/helpbot/sys/tag/Tag.java

@@ -81,6 +81,6 @@ public void sendResponse(TextChannel channel) {
                 .setFooter("Written by "+user.getAsTag(), user.getAvatarUrl());
         if (!getImage().equals("")) embed.setImage(getImage());
 
-        channel.sendMessage(embed.build()).queue();
+        channel.sendMessageEmbeds(embed.build()).queue();
     }
 }

src/main/java/com/diamondfire/helpbot/sys/tasks/impl/RefreshCreditsTask.java

@@ -12,7 +12,7 @@ public class RefreshCreditsTask implements MidnightTask {
     public void run() {
         PresetBuilder preset = new PresetBuilder();
         preset.withPreset(new InformativeReply(InformativeReplyType.INFO, "Credit log db has been updated"));
-        RESPONSE_CHANNEL.sendMessage(preset.getEmbed().build()).queue();
+        RESPONSE_CHANNEL.sendMessageEmbeds(preset.getEmbed().build()).queue();
 
         new DatabaseQuery()
                 .query(new BasicQuery("INSERT INTO owen.creator_rankings_log(uuid, points, `rank`, date) " +

src/main/java/com/diamondfire/helpbot/sys/tasks/impl/SupportUnexcuseTask.java

@@ -56,7 +56,7 @@ public void run() {
                     );
                     embed.setTitle(String.format("Excuse has expired! (%s day duration)", Duration.between(initDate.toInstant(), Instant.now()).toDays()));
 
-                    channel.sendMessage(embed.build()).queue();
+                    channel.sendMessageEmbeds(embed.build()).queue();
 
                     new DatabaseQuery()
                             .query(new BasicQuery("UPDATE owen.excused_staff SET handled = true WHERE uuid = ?", (statement) -> statement.setString(1, uuid)))

src/main/java/com/diamondfire/helpbot/util/Util.java

@@ -114,7 +114,7 @@ public static void log(PresetBuilder builder) {
     }
 
     public static void log(EmbedBuilder builder) {
-        HelpBotInstance.getJda().getTextChannelById(HelpBotInstance.LOG_CHANNEL).sendMessage(builder.build()).queue();
+        HelpBotInstance.getJda().getTextChannelById(HelpBotInstance.LOG_CHANNEL).sendMessageEmbeds(builder.build()).queue();
     }
 
     public static void updateGuild(HashMap<Long, String> accounts, Guild guild) {