Update to JDA alpha v13

Author: Matyrobbrt

gradle/libs.versions.toml

@@ -6,7 +6,7 @@ lombok = { id = "io.freefair.lombok", version = "6.4.3" }
 launch4j = { id = 'edu.sc.seis.launch4j', version = '2.5.3'}
 
 [versions]
-jda = "5.0.0-alpha.12"
+jda = "5.0.0-alpha.13"
 # https://github.com/Matyrobbrt/JDA-Chewtils/commit/252809f87422562223b7d1af571af75d819f5a65
 # chewtils = "2.0-SNAPSHOT"
 chewtils = "252809f"

relauncher

@@ -92,6 +92,7 @@
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.MessageChannel;
+import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.events.Event;
 import net.dv8tion.jda.api.events.ReadyEvent;
 import net.dv8tion.jda.api.hooks.EventListener;
@@ -181,14 +182,14 @@ public Logger getLogger() {
     private static final Set<GatewayIntent> INTENTS = Set.of(
         GatewayIntent.DIRECT_MESSAGES,
         GatewayIntent.GUILD_BANS,
-        GatewayIntent.GUILD_EMOJIS,
+        GatewayIntent.GUILD_EMOJIS_AND_STICKERS,
         GatewayIntent.GUILD_MESSAGE_REACTIONS,
         GatewayIntent.GUILD_MESSAGES,
         GatewayIntent.GUILD_MEMBERS
     );
 
     private static final Set<Message.MentionType> DEFAULT_MENTIONS = EnumSet.of(
-        Message.MentionType.EMOTE,
+        Message.MentionType.EMOJI,
         Message.MentionType.CHANNEL
     );
 
@@ -199,7 +200,7 @@ public Logger getLogger() {
         Permission.MANAGE_ROLES
     );
 
-    private static final String COMMAND_RECEIVED = "☑️";
+    private static final Emoji COMMAND_RECEIVED = Emoji.fromUnicode("☑️");
 
     /**
      * The instance.

src/commander/java/com/mcmoddev/mmdbot/commander/TheCommander.java

@@ -35,11 +35,13 @@
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.MessageBuilder;
 import net.dv8tion.jda.api.Permission;
-import net.dv8tion.jda.api.entities.Emoji;
+import net.dv8tion.jda.api.entities.emoji.CustomEmoji;
+import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.entities.MessageReaction;
 import net.dv8tion.jda.api.entities.Role;
+import net.dv8tion.jda.api.entities.emoji.UnicodeEmoji;
 import net.dv8tion.jda.api.events.GenericEvent;
 import net.dv8tion.jda.api.events.message.react.GenericMessageReactionEvent;
 import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
@@ -55,7 +57,6 @@
 import net.dv8tion.jda.api.interactions.components.selections.SelectOption;
 import net.dv8tion.jda.api.interactions.components.text.TextInput;
 import net.dv8tion.jda.api.interactions.components.text.TextInputStyle;
-import net.dv8tion.jda.internal.requests.restaction.interactions.ModalCallbackActionImpl;
 import net.dv8tion.jda.internal.utils.EncodingUtil;
 import org.jetbrains.annotations.NotNull;
 
@@ -109,14 +110,14 @@ private RoleSelectCommand() {
                         final var channelId = channel.getIdLong(); // Field must be final for lambda usage
                         final long messageId = Long.parseLong(msgIdStr);
                         final var role = Objects.requireNonNull(event.getOption("role", OptionMapping::getAsRole));
-                        final var emote = Emoji.fromMarkdown(event.getOption("emote", "", OptionMapping::getAsString).replace(" ", ""));
+                        final var emote = Emoji.fromFormatted(event.getOption("emote", "", OptionMapping::getAsString).replace(" ", ""));
                         final var emoteStr = getEmoteAsString(emote);
 
-                        channel.addReactionById(messageId, emoteStr).flatMap($ -> {
+                        channel.addReactionById(messageId, emote).flatMap($ -> {
                             // Emote IDs are expected, but the emoteStr is also prefixed with :emojiName:
                             TheCommander.getInstance()
                                 .getJdbi()
-                                .useExtension(ReactionRolePanels.class, db -> db.insert(channelId, messageId, emote.isCustom() ? emote.getId() : emoteStr, role.getIdLong(), event.getOption("permanent", false, OptionMapping::getAsBoolean)));
+                                .useExtension(ReactionRolePanels.class, db -> db.insert(channelId, messageId, emote.getType() == Emoji.Type.CUSTOM ? ((CustomEmoji) emote).getId() : emoteStr, role.getIdLong(), event.getOption("permanent", false, OptionMapping::getAsBoolean)));
                             return event.deferReply(true)
                                 .addEmbeds(new EmbedBuilder()
                                     .setColor(Color.GREEN)
@@ -377,9 +378,9 @@ protected void execute(final SlashCommandEvent event) {
     }
 
     public static String getEmoteAsString(final Emoji emoji) {
-        return emoji.isCustom() ? emoji.getAsMention().replaceAll("[<>]*", "")
+        return emoji.getType() == Emoji.Type.CUSTOM ? emoji.getFormatted().replaceAll("[<>]*", "")
             /* this will give the emoji in the format emojiName:emojiId */ :
-            EncodingUtil.encodeCodepoints(emoji.getName());
+            ((UnicodeEmoji) emoji).getAsCodepoints();
     }
 
     @Override
@@ -395,7 +396,7 @@ private void doRolePanelStuff(final GenericMessageReactionEvent event, final boo
         if (!event.isFromGuild() || event.getUser() != null && event.getUser().isBot() || event.getUser().isSystem()) {
             return;
         }
-        final var emote = getEmoteAsString(event.getReactionEmote());
+        final var emote = getEmoteAsString(event.getReaction());
         final var roleId = withExtension(db -> db.getRole(event.getChannel().getIdLong(), event.getMessageIdLong(), emote));
         if (roleId == null) return;
         final var role = event.getGuild().getRoleById(roleId);
@@ -413,8 +414,9 @@ private void doRolePanelStuff(final GenericMessageReactionEvent event, final boo
         }
     }
 
-    public static String getEmoteAsString(final MessageReaction.ReactionEmote reactionEmote) {
-        return reactionEmote.isEmoji() ? reactionEmote.getAsCodepoints() : reactionEmote.getEmote().getId();
+    public static String getEmoteAsString(final MessageReaction reactionEmote) {
+        return reactionEmote.getEmoji().getType() == Emoji.Type.UNICODE ? ((UnicodeEmoji) reactionEmote.getEmoji()).getAsCodepoints()
+            : ((CustomEmoji) reactionEmote.getEmoji()).getId();
     }
 
     public static <R> R withExtension(Function<ReactionRolePanels, R> callback) {

src/commander/java/com/mcmoddev/mmdbot/commander/commands/RoleSelectCommand.java

@@ -58,7 +58,7 @@ public class ServerCommands {
             embed.setThumbnail(guild.getIconUrl());
             embed.addField("Guild's name:", guild.getName(), true);
             embed.addField("Member count:", Integer.toString(guild.getMemberCount()), true);
-            embed.addField("Emote count:", Long.toString(guild.getEmoteCache().size()), true);
+            embed.addField("Emote count:", Long.toString(guild.getEmojiCache().size()), true);
             embed.addField("Category count:", Long.toString(guild.getCategoryCache().size()), true);
             embed.addField("Channel count:", Integer.toString(guild.getChannels().size()), true);
             embed.addField("Role count:", Long.toString(guild.getRoleCache().size()), true);

src/commander/java/com/mcmoddev/mmdbot/commander/commands/ServerCommands.java

@@ -31,7 +31,7 @@
 import io.github.matyrobbrt.curseforgeapi.util.Utils;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.entities.Emoji;
+import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;

src/commander/java/com/mcmoddev/mmdbot/commander/commands/XkcdCommand.java

@@ -29,7 +29,7 @@
 import com.mcmoddev.mmdbot.core.util.dictionary.DictionaryEntry;
 import com.mcmoddev.mmdbot.core.util.dictionary.DictionaryUtils;
 import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.entities.Emoji;
+import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
@@ -98,7 +98,7 @@ public static EmbedBuilder getEmbed(final DictionaryEntry entry, final int pageN
         }
 
         if (definition.emoji() != null) {
-            embed.addField("Emoji", Emoji.fromUnicode(definition.emoji()).getAsMention(), false);
+            embed.addField("Emoji", Emoji.fromUnicode(definition.emoji()).getFormatted(), false);
         }
 
         if (definition.image() != null) {

src/commander/java/com/mcmoddev/mmdbot/commander/commands/misc/DictionaryCommand.java

@@ -29,7 +29,7 @@
 import com.mcmoddev.mmdbot.core.commands.paginate.PaginatedCommand;
 import com.mcmoddev.mmdbot.core.commands.paginate.Paginator;
 import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.entities.Emoji;
+import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;

src/commander/java/com/mcmoddev/mmdbot/commander/commands/misc/HelpCommand.java

@@ -31,7 +31,7 @@
 import de.ialistannen.javadocapi.util.BaseUrlElementLoader;
 import de.ialistannen.javadocapi.util.NameShortener;
 import net.dv8tion.jda.api.MessageBuilder;
-import net.dv8tion.jda.api.entities.Emoji;
+import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.interactions.components.ActionRow;
 import net.dv8tion.jda.api.interactions.components.buttons.Button;
@@ -220,16 +220,16 @@ private List<ActionRow> buildRowsMenu(List<IndexedPair<String, FuzzyQueryResult>
 
     private Emoji getEmoji(FuzzyQueryResult result) {
         if (result.getQualifiedName().asString().endsWith("Exception")) {
-            return Emoji.fromMarkdown("<:Exception:871325719127547945>");
+            return Emoji.fromFormatted("<:Exception:871325719127547945>");
         }
 
         return switch (result.getType()) {
-            case METHOD -> Emoji.fromMarkdown("<:Method:871140776711708743>");
-            case FIELD -> Emoji.fromMarkdown("<:Field:871140776346791987>");
-            case ANNOTATION -> Emoji.fromMarkdown("<:Annotation:871325719563751444>");
-            case ENUM -> Emoji.fromMarkdown("<:Enum:871325719362412594>");
-            case INTERFACE -> Emoji.fromMarkdown("<:Interface:871325719576318002>");
-            case CLASS -> Emoji.fromMarkdown("<:Class:871140776900440074>");
+            case METHOD -> Emoji.fromFormatted("<:Method:871140776711708743>");
+            case FIELD -> Emoji.fromFormatted("<:Field:871140776346791987>");
+            case ANNOTATION -> Emoji.fromFormatted("<:Annotation:871325719563751444>");
+            case ENUM -> Emoji.fromFormatted("<:Enum:871325719362412594>");
+            case INTERFACE -> Emoji.fromFormatted("<:Interface:871325719576318002>");
+            case CLASS -> Emoji.fromFormatted("<:Class:871140776900440074>");
         };
     }
 

src/commander/java/com/mcmoddev/mmdbot/commander/docs/NormalDocsSender.java

@@ -22,7 +22,7 @@
 
 import com.mcmoddev.mmdbot.core.util.event.DismissListener;
 import net.dv8tion.jda.api.MessageBuilder;
-import net.dv8tion.jda.api.entities.Emoji;
+import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.events.GenericEvent;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.hooks.EventListener;
@@ -43,7 +43,7 @@ public class FilePreviewListener implements EventListener {
         "cpp", "c", "gradle"
     );
 
-    public static final Emoji DISMISS_EMOJI = Emoji.fromMarkdown("\uD83D\uDEAE");
+    public static final Emoji DISMISS_EMOJI = Emoji.fromUnicode("\uD83D\uDEAE");
 
     public static final String URL = "https://discordbot.matyrobbrt.com/fpreview?url=";