Merge branch '4.0' of https://github.com/MinecraftModDevelopment/MMDBot into 4.0

Author: Matyrobbrt

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

@@ -59,7 +59,6 @@
 import com.mcmoddev.mmdbot.commander.util.EventListeners;
 import com.mcmoddev.mmdbot.commander.util.ThreadChannelCreatorEvents;
 import com.mcmoddev.mmdbot.commander.util.mc.MCVersions;
-import com.mcmoddev.mmdbot.commander.util.oldchannels.ChannelMessageChecker;
 import com.mcmoddev.mmdbot.commander.util.oldchannels.OldChannelsHelper;
 import com.mcmoddev.mmdbot.core.bot.Bot;
 import com.mcmoddev.mmdbot.core.bot.BotRegistry;
@@ -71,12 +70,12 @@
 import com.mcmoddev.mmdbot.core.commands.component.DeferredComponentListenerRegistry;
 import com.mcmoddev.mmdbot.core.commands.component.storage.ComponentStorage;
 import com.mcmoddev.mmdbot.core.event.Events;
-import com.mcmoddev.mmdbot.core.util.config.ConfigurateUtils;
 import com.mcmoddev.mmdbot.core.util.DotenvLoader;
 import com.mcmoddev.mmdbot.core.util.MessageUtilities;
 import com.mcmoddev.mmdbot.core.util.ReflectionsUtils;
 import com.mcmoddev.mmdbot.core.util.TaskScheduler;
 import com.mcmoddev.mmdbot.core.util.Utils;
+import com.mcmoddev.mmdbot.core.util.config.ConfigurateUtils;
 import com.mcmoddev.mmdbot.core.util.config.SnowflakeValue;
 import com.mcmoddev.mmdbot.core.util.dictionary.DictionaryUtils;
 import com.mcmoddev.mmdbot.core.util.event.DismissListener;
@@ -371,7 +370,8 @@ public void onCommand(final CommandEvent event, final Command command) {
         EventListeners.COMMANDS_LISTENER.addListener((EventListener) commandClient);
 
         {
-            record SlashCommandRegistration(Object fieldValue, RegisterSlashCommand annotation) {}
+            record SlashCommandRegistration(Object fieldValue, RegisterSlashCommand annotation) {
+            }
 
             // Command register
             ReflectionsUtils.getFieldsAnnotatedWith(RegisterSlashCommand.class)

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

@@ -69,13 +69,13 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
-import static com.mcmoddev.mmdbot.core.util.event.DismissListener.createDismissButton;
 import static com.mcmoddev.mmdbot.commander.util.script.ScriptingUtils.ALLOWED_MENTIONS;
 import static com.mcmoddev.mmdbot.commander.util.script.ScriptingUtils.createGuild;
 import static com.mcmoddev.mmdbot.commander.util.script.ScriptingUtils.createMessageChannel;
 import static com.mcmoddev.mmdbot.commander.util.script.ScriptingUtils.createTextChannel;
 import static com.mcmoddev.mmdbot.commander.util.script.ScriptingUtils.getEmbedFromValue;
 import static com.mcmoddev.mmdbot.commander.util.script.ScriptingUtils.validateArgs;
+import static com.mcmoddev.mmdbot.core.util.event.DismissListener.createDismissButton;
 
 public class EvaluateCommand extends SlashCommand {
 
@@ -122,7 +122,7 @@ protected void execute(final SlashCommandEvent event) {
                                 return;
                             }
                             hook.editOriginal("There was an exception evaluating "
-                                + exception.getLocalizedMessage())
+                                    + exception.getLocalizedMessage())
                                 .setActionRow(createDismissButton())
                                 .queue();
                         }
@@ -164,7 +164,7 @@ public void onModalInteraction(@NotNull final ModalInteractionEvent event) {
                                 return;
                             }
                             hook.editOriginal("There was an exception evaluating "
-                                + exception.getLocalizedMessage())
+                                    + exception.getLocalizedMessage())
                                 .setActionRow(createDismissButton(event))
                                 .queue();
                         }

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

@@ -35,12 +35,12 @@
 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.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.CustomEmoji;
+import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.entities.emoji.UnicodeEmoji;
 import net.dv8tion.jda.api.events.GenericEvent;
 import net.dv8tion.jda.api.events.message.react.GenericMessageReactionEvent;
@@ -57,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.utils.EncodingUtil;
 import org.jetbrains.annotations.NotNull;
 
 import java.awt.Color;
@@ -91,7 +90,7 @@ private RoleSelectCommand() {
         userPermissions = new Permission[]{
             Permission.MANAGE_ROLES
         };
-        children = new SlashCommand[] {
+        children = new SlashCommand[]{
             command("buttons", "Creates a role panel with buttons.", event -> executeSub(event, false), new OptionData(OptionType.STRING, "roles", "Mention the roles to add to the panel.", true)),
             command("dropdown", "Creates a dropdown role panel.", event -> executeSub(event, true), new OptionData(OptionType.STRING, "roles", "Mention the roles to add to the panel.", true)),
             command("reaction", "Creates a reaction role panel.", event -> {
@@ -133,7 +132,7 @@ private RoleSelectCommand() {
                             .formatted(e.getLocalizedMessage())).mentionRepliedUser(false).queue();
                         TheCommander.LOGGER.error("There was an error running the `/role-select reaction` command", e);
                     }
-            }, new OptionData(OptionType.STRING, "message", "The ID of the message on which to create the panel.", true),
+                }, new OptionData(OptionType.STRING, "message", "The ID of the message on which to create the panel.", true),
                 new OptionData(OptionType.ROLE, "role", "The role to add to the panel.", true),
                 new OptionData(OptionType.STRING, "emote", "The emote which will be associated with that role.", true),
                 new OptionData(OptionType.BOOLEAN, "permanent", "If the role assigned by the panel is permanent.")
@@ -370,6 +369,7 @@ private static SlashCommand command(String cmdName, String description, Consumer
                 this.help = description;
                 this.options = List.of(cmdOptions);
             }
+
             @Override
             protected void execute(final SlashCommandEvent event) {
                 consumer.accept(event);

src/commander/java/com/mcmoddev/mmdbot/commander/commands/comchannels/CommunityChannelCommand.java

@@ -38,12 +38,7 @@
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 
 /**
  * Create a community channel owned by the specified user.
@@ -76,7 +71,7 @@ public final class CommunityChannelCommand extends SlashCommand {
     public CommunityChannelCommand() {
         super();
         name = "community-channel";
-        children = new SlashCommand[] {
+        children = new SlashCommand[]{
             new Create(), new Transfer(), new Owner()
         };
     }

src/commander/java/com/mcmoddev/mmdbot/commander/commands/tricks/AddTrickCommand.java

@@ -155,7 +155,7 @@ public static final class Prefix extends Command {
 
         public Prefix() {
             name = "addtrick";
-            aliases = new String[] {"add-trick"};
+            aliases = new String[]{"add-trick"};
             requiredRole = "Bot Maintainer";
             guildOnly = true;
             children = Tricks.getTrickTypes().entrySet().stream().map(e -> new PrefixSubCmd(e.getKey(), e.getValue())).toArray(Command[]::new);

src/commander/java/com/mcmoddev/mmdbot/commander/config/Configuration.java

@@ -20,16 +20,13 @@
  */
 package com.mcmoddev.mmdbot.commander.config;
 
-import com.jagrosh.jdautilities.commons.utils.SafeIdUtil;
 import com.mcmoddev.mmdbot.core.util.config.SnowflakeValue;
-import net.dv8tion.jda.api.Permission;
 import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 import org.spongepowered.configurate.objectmapping.meta.Comment;
 import org.spongepowered.configurate.objectmapping.meta.Required;
 import org.spongepowered.configurate.objectmapping.meta.Setting;
 
 import java.util.ArrayList;
-import java.util.EnumSet;
 import java.util.List;
 
 @SuppressWarnings("FieldMayBeFinal")

src/commander/java/com/mcmoddev/mmdbot/commander/config/GuildConfiguration.java

@@ -23,7 +23,6 @@
 import com.jagrosh.jdautilities.command.GuildSettingsManager;
 import com.mcmoddev.mmdbot.core.util.config.SnowflakeValue;
 import it.unimi.dsi.fastutil.longs.Long2ObjectFunction;
-import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Guild;
 import org.jsoup.internal.ReturnsAreNonnullByDefault;
@@ -33,7 +32,6 @@
 import org.spongepowered.configurate.objectmapping.meta.Setting;
 
 import javax.annotation.Nullable;
-import java.util.List;
 import java.util.Set;
 
 @ConfigSerializable
@@ -44,6 +42,7 @@ public final class GuildConfiguration {
     @Required
     @Setting("channels")
     private Channels channels = new Channels();
+
     public Channels channels() {
         return channels;
     }
@@ -54,6 +53,7 @@ public static final class Channels {
         @Setting("community")
         @Comment("Community channels related configuration")
         private Community community = new Community();
+
         public Community community() {
             return community;
         }
@@ -64,6 +64,7 @@ public static final class Community {
             @Setting("category")
             @Comment("The snowflake ID of the channel category where new community channels are created under")
             private SnowflakeValue category = SnowflakeValue.EMPTY;
+
             public SnowflakeValue category() {
                 return category;
             }
@@ -72,6 +73,7 @@ public SnowflakeValue category() {
             @Setting("archival_duration")
             @Comment("The number of days that need to pass without a message sent for a community channel to start the archival process.")
             private int archivalDuration = 60;
+
             public int archivalDuration() {
                 return archivalDuration;
             }
@@ -89,6 +91,7 @@ public SnowflakeValue archivedCategory() {
             @Setting("archival_notifier")
             @Comment("The ID of the channel where archival notifications will be sent.")
             private SnowflakeValue archivalNotifier = SnowflakeValue.EMPTY;
+
             public SnowflakeValue archivalNotifier() {
                 return archivalNotifier;
             }
@@ -110,6 +113,7 @@ This can be either bitfield, or a list of strings of the names of permissions (s
                 Note: the bot can only assign permissions to channel owners if the bot has those permissions
                 Example: ["Manage Messages", "MANAGE_PERMISSIONS"]""")
             private PermissionList ownerPermissions = new PermissionList(Set.of(Permission.MESSAGE_MANAGE));
+
             public PermissionList ownerPermissions() {
                 return ownerPermissions;
             }
@@ -118,6 +122,7 @@ public PermissionList ownerPermissions() {
             @Setting("channel_created_message")
             @Comment("The message to send in the channel after it is created.")
             private String channelCreatedMessage = "Welcome {user} to your new channel ({channel}) here at {guild}. Enjoy your stay!";
+
             public String getChannelCreatedMessage() {
                 return channelCreatedMessage;
             }
@@ -167,7 +172,8 @@ public int getLimitPerUser() {
         }
     }
 
-    public record SettingManager(Long2ObjectFunction<GuildConfiguration> getter) implements GuildSettingsManager<GuildConfiguration> {
+    public record SettingManager(
+        Long2ObjectFunction<GuildConfiguration> getter) implements GuildSettingsManager<GuildConfiguration> {
 
         @Nullable
         @Override

src/commander/java/com/mcmoddev/mmdbot/commander/config/PermissionList.java

@@ -59,7 +59,8 @@ public PermissionList deserialize(final Type type, final ConfigurationNode node)
             if (node.raw() instanceof Number num) {
                 return new PermissionList(num.longValue());
             }
-            final var list = node.get(new TypeToken<List<String>>() {});
+            final var list = node.get(new TypeToken<List<String>>() {
+            });
             if (list == null) return null;
             final EnumSet<Permission> permissions = EnumSet.noneOf(Permission.class);
             outer:
@@ -80,7 +81,8 @@ public void serialize(final Type type, @Nullable final PermissionList obj, final
                 node.raw(null);
                 return;
             }
-            node.set(new TypeToken<List<String>>() {}.getType(), obj.delegate.stream().map(Permission::getName).toList());
+            node.set(new TypeToken<List<String>>() {
+            }.getType(), obj.delegate.stream().map(Permission::getName).toList());
         }
     }
 }

src/commander/java/com/mcmoddev/mmdbot/commander/custompings/CustomPingsListener.java

@@ -20,7 +20,6 @@
  */
 package com.mcmoddev.mmdbot.commander.custompings;
 
-import static com.mcmoddev.mmdbot.commander.TheCommander.getInstance;
 import com.mcmoddev.mmdbot.commander.TheCommander;
 import com.mcmoddev.mmdbot.core.util.Utils;
 import com.mcmoddev.mmdbot.core.util.event.ThreadedEventListener;
@@ -44,6 +43,8 @@
 
 import java.util.concurrent.Executors;
 
+import static com.mcmoddev.mmdbot.commander.TheCommander.getInstance;
+
 public class CustomPingsListener extends ListenerAdapter {
     public static final LazySupplier<EventListener> LISTENER = LazySupplier.of(() -> new ThreadedEventListener(Executors.newSingleThreadExecutor(r -> Utils.setThreadDaemon(new Thread(r, "CustomPingsListener"), true)),
         new CustomPingsListener()));

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

@@ -20,8 +20,8 @@
  */
 package com.mcmoddev.mmdbot.commander.docs;
 
-import com.mcmoddev.mmdbot.core.util.config.ConfigurateUtils;
 import com.mcmoddev.mmdbot.core.util.Constants;
+import com.mcmoddev.mmdbot.core.util.config.ConfigurateUtils;
 import de.ialistannen.javadocapi.indexing.OnlineJavadocIndexer;
 import de.ialistannen.javadocapi.rendering.Java11PlusLinkResolver;
 import de.ialistannen.javadocapi.spoon.JavadocElementExtractor;