Update to 1.21.9 and fix deprecations

Author: booky10

build.gradle.kts

@@ -38,6 +38,7 @@ dependencies {
     // optional dependency
     compileOnlyApi(libs.spark.api)
     compileOnly(libs.floodgate.api)
+    compileOnly(libs.luckperms.api)
 
     // integrated metrics
     implementation(libs.bstats)
@@ -72,7 +73,7 @@ paper {
     main = "$group.cloudbot.CloudBotMain"
     loader = "$group.cloudbot.CloudBotLoader"
 
-    apiVersion = "1.20"
+    apiVersion = "1.21.7"
     authors = listOf("booky10")
     load = BukkitPluginDescription.PluginLoadOrder.POSTWORLD
 
@@ -88,6 +89,10 @@ paper {
             load = PaperPluginDescription.RelativeLoadOrder.BEFORE
             required = false
         }
+        register("LuckPerms") {
+            load = PaperPluginDescription.RelativeLoadOrder.BEFORE
+            required = false
+        }
     }
 }
 

gradle/libs.versions.toml

@@ -1,18 +1,19 @@
 [versions]
 pluginyml = "0.6.0"
-runtask = "2.3.1"
-shadow = "8.3.3"
+runtask = "3.0.0"
+shadow = "8.3.9"
 
-minecraft = "1.21.1"
-paperapi = "1.21.1-R0.1-SNAPSHOT"
+minecraft = "1.21.9"
+paperapi = "1.21.9-R0.1-SNAPSHOT"
 
 cloudcore = "1.1.0-SNAPSHOT"
-configurate = "4.1.2"
+configurate = "4.2.0"
 bstats = "3.1.0"
 
-discord4j = "3.3.0-RC1"
+discord4j = "3.3.0-RC3"
 spark-api = "0.1-SNAPSHOT"
-floodgate = "2.2.3-SNAPSHOT"
+floodgate = "2.2.5-SNAPSHOT"
+luckperms = "5.5-SNAPSHOT"
 
 [plugins]
 pluginyml-paper = { id = "net.minecrell.plugin-yml.paper", version.ref = "pluginyml" }
@@ -29,3 +30,4 @@ cloudcore = { module = "dev.booky:cloudcore", version.ref = "cloudcore" }
 discord4j-core = { module = "com.discord4j:discord4j-core", version.ref = "discord4j" }
 spark-api = { module = "me.lucko:spark-api", version.ref = "spark-api" }
 floodgate-api = { module = "org.geysermc.floodgate:api", version.ref = "floodgate" }
+luckperms-api = { module = "net.luckperms:api", version.ref = "luckperms" }

src/main/java/dev/booky/cloudbot/commands/MessageCommand.java

@@ -19,10 +19,10 @@
 import discord4j.core.object.component.Button;
 import discord4j.core.object.component.SelectMenu;
 import discord4j.core.object.component.TextInput;
+import discord4j.core.object.emoji.Emoji;
 import discord4j.core.object.entity.Message;
 import discord4j.core.object.entity.User;
 import discord4j.core.object.entity.channel.GuildMessageChannel;
-import discord4j.core.object.reaction.ReactionEmoji;
 import discord4j.core.spec.EmbedCreateFields;
 import discord4j.core.spec.EmbedCreateSpec;
 import discord4j.core.spec.InteractionPresentModalSpec;
@@ -139,28 +139,28 @@ private Mono<Void> runSelection(ChatInputInteractionEvent event, Translator i18n
         SelectMenu selectMenu = SelectMenu.of(SELECTION_ID,
                         SelectMenu.Option.of(i18n.apply("command.message.selection.message.name"), SELECT_MESSAGE)
                                 .withDescription(i18n.apply("command.message.selection.message.desc"))
-                                .withEmoji(ReactionEmoji.unicode("\uD83D\uDCE7")),
+                                .withEmoji(Emoji.unicode("\uD83D\uDCE7")),
                         SelectMenu.Option.of(i18n.apply("command.message.selection.embed.name"), SELECT_EMBED)
                                 .withDescription(i18n.apply("command.message.selection.embed.desc"))
-                                .withEmoji(ReactionEmoji.unicode("\uD83D\uDCDC")))
+                                .withEmoji(Emoji.unicode("\uD83D\uDCDC")))
                 .withPlaceholder(i18n.apply("command.message.selection.hint"));
         return event.reply()
                 .withEphemeral(true)
                 .withComponents(ActionRow.of(selectMenu));
     }
 
     private Button getEditButton(Translator i18n) {
-        return Button.primary(EDIT_ID, ReactionEmoji.unicode("\u270F\uFE0F"),
+        return Button.primary(EDIT_ID, Emoji.unicode("\u270F\uFE0F"),
                 i18n.apply("command.message.edit"));
     }
 
     private Button getImportButton(Translator i18n) {
-        return Button.primary(IMPORT_ID, ReactionEmoji.unicode("\u2B07\uFE0F"),
+        return Button.primary(IMPORT_ID, Emoji.unicode("\u2B07\uFE0F"),
                 i18n.apply("command.message.import"));
     }
 
     private Button getSendButton(Translator i18n) {
-        return Button.success(SEND_ID, ReactionEmoji.unicode("\uD83D\uDCE8"),
+        return Button.success(SEND_ID, Emoji.unicode("\uD83D\uDCE8"),
                 i18n.apply("command.message.send"));
     }
 
@@ -212,7 +212,7 @@ public InteractionPresentModalSpec createEmbedEditModal(Translator i18n, Message
         }
 
         TextInput imageInput = TextInput.small(EE_IMAGE_ID,
-                i18n.apply("command.message.embed.image"))
+                        i18n.apply("command.message.embed.image"))
                 .required(false);
         if (embed.getImage().isPresent()) {
             String imageUrl = embed.getImage().map(Embed.Image::getUrl).orElseThrow();
@@ -283,7 +283,7 @@ public Mono<Void> onButtonInteract(ButtonInteractionEvent event) {
                     modalSpec = this.createMessageEditModal(i18n, message);
                 } else {
                     // more complex embed creation modal
-                    Embed embed = message.getEmbeds().get(0);
+                    Embed embed = message.getEmbeds().getFirst();
                     modalSpec = this.createEmbedEditModal(i18n, message, embed);
                 }
 

src/main/java/dev/booky/cloudbot/dclistener/CommandListener.java

@@ -19,7 +19,6 @@
 import dev.booky.cloudbot.events.custom.MainGuildDataReloadEvent;
 import dev.booky.cloudbot.i18n.Translator;
 import dev.booky.cloudbot.storage.CloudBotConfig;
-import dev.booky.cloudbot.util.ApplicationIdUtil;
 import dev.booky.cloudbot.util.CommandStringifier;
 import dev.booky.cloudbot.util.MarkdownEscape;
 import discord4j.common.util.Snowflake;
@@ -31,6 +30,8 @@
 import discord4j.core.object.entity.channel.GuildMessageChannel;
 import discord4j.core.spec.EmbedCreateSpec;
 import discord4j.discordjson.json.ApplicationCommandRequest;
+import discord4j.discordjson.json.ImmutableMessageReferenceData;
+import discord4j.discordjson.json.MessageReferenceData;
 import discord4j.rest.service.ApplicationService;
 import discord4j.rest.util.Color;
 import reactor.core.publisher.Mono;
@@ -172,6 +173,11 @@ public Mono<Void> handleException(Throwable throwable,
                 stacktrace = stacktrace.substring(0, maxSize - 3 /*three dots*/) + "...";
             }
 
+            ImmutableMessageReferenceData.Builder ref = MessageReferenceData.builder();
+            msg.getGuildId().ifPresent(guild -> ref.guildId(guild.asLong()));
+            ref.channelId(msg.getChannelId().asLong());
+            ref.messageId(msg.getId().asLong());
+
             User user = event.getInteraction().getUser();
             logChannel.createMessage()
                     .withEmbeds(EmbedCreateSpec.builder()
@@ -180,7 +186,7 @@ public Mono<Void> handleException(Throwable throwable,
                             .timestamp(Instant.now())
                             .footer(user.getTag(), user.getAvatarUrl())
                             .build())
-                    .withMessageReference(msg.getId())
+                    .withMessageReference(ref.build())
                     .subscribe();
         });
 

src/main/java/dev/booky/cloudbot/dclistener/ReactionRoleListener.java

@@ -11,9 +11,10 @@
 import discord4j.core.event.domain.message.ReactionAddEvent;
 import discord4j.core.event.domain.message.ReactionRemoveAllEvent;
 import discord4j.core.event.domain.message.ReactionRemoveEvent;
+import discord4j.core.object.emoji.Emoji;
+import discord4j.core.object.emoji.UnicodeEmoji;
 import discord4j.core.object.entity.Guild;
 import discord4j.core.object.reaction.Reaction;
-import discord4j.core.object.reaction.ReactionEmoji;
 import reactor.core.publisher.Mono;
 
 import java.util.Map;
@@ -35,7 +36,7 @@ public Mono<Void> reloadReactionRoles(Guild mainGuild) {
                 mono = mono.and(entry.getKey().getMessage(mainGuild).flatMap(message -> {
                     Mono<Void> reactionMono = Mono.empty();
                     for (CloudBotConfig.ReactionRole role : entry.getValue()) {
-                        ReactionEmoji.Unicode emoji = ReactionEmoji.unicode(role.getEmoji());
+                        UnicodeEmoji emoji = Emoji.unicode(role.getEmoji());
                         if (message.getReactions().stream().map(Reaction::getEmoji).noneMatch(Predicate.isEqual(emoji))) {
                             reactionMono = reactionMono.and(message.addReaction(emoji).then());
                         }

src/main/java/dev/booky/cloudbot/i18n/TranslationManager.java

@@ -2,7 +2,6 @@
 // Created by booky10 in CloudBot (23:24 11.10.22)
 
 import discord4j.core.event.domain.interaction.ChatInputInteractionEvent;
-import net.kyori.adventure.util.UTF8ResourceBundleControl;
 import org.bukkit.plugin.Plugin;
 
 import java.text.AttributedCharacterIterator;
@@ -11,6 +10,8 @@
 import java.util.Objects;
 import java.util.ResourceBundle;
 
+import static net.kyori.adventure.util.UTF8ResourceBundleControl.utf8ResourceBundleControl;
+
 public final class TranslationManager {
 
     private final Plugin plugin;
@@ -73,7 +74,7 @@ public void reload() {
 
     private void registerBundle(TranslationRegistry registry, Locale locale) {
         String baseName = this.plugin.getPluginMeta().getName().toLowerCase(Locale.ROOT);
-        ResourceBundle bundle = ResourceBundle.getBundle(baseName, locale, UTF8ResourceBundleControl.get());
+        ResourceBundle bundle = ResourceBundle.getBundle(baseName, locale, utf8ResourceBundleControl());
         registry.registerAll(locale, bundle, true);
     }
 

src/main/java/dev/booky/cloudbot/listener/LoginListener.java

@@ -1,45 +1,65 @@
 package dev.booky.cloudbot.listener;
 // Created by booky10 in CloudBot (17:39 12.10.22)
 
+import com.destroystokyo.paper.profile.PlayerProfile;
 import dev.booky.cloudbot.CloudBotManager;
 import dev.booky.cloudbot.util.FloodgateUtil;
+import dev.booky.cloudbot.util.LuckPermsUtil;
+import io.papermc.paper.connection.PlayerConfigurationConnection;
+import io.papermc.paper.connection.PlayerLoginConnection;
+import io.papermc.paper.event.connection.PlayerConnectionValidateLoginEvent;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerLoginEvent;
 
+import java.util.Objects;
 import java.util.OptionalLong;
 import java.util.UUID;
 
 public class LoginListener implements Listener {
 
+    private static final UUID NULL_UUID = new UUID(0L, 0L);
+
     private final CloudBotManager manager;
 
     public LoginListener(CloudBotManager manager) {
         this.manager = manager;
     }
 
     @EventHandler(priority = EventPriority.HIGH)
-    public void onLogin(PlayerLoginEvent event) {
-        if (event.getResult() != PlayerLoginEvent.Result.ALLOWED) {
-            return;
+    public void onLogin(PlayerConnectionValidateLoginEvent event) {
+        if (event.getKickMessage() != null) {
+            return; // already kicked
         }
         if (!this.manager.getConfig().isWhitelistActive()) {
             return;
         }
 
-        UUID uniqueId = event.getPlayer().getUniqueId();
-        if (this.manager.getStorage().getWhitelist().containsKey(uniqueId)) {
-            return;
+        UUID playerId = switch (event.getConnection()) {
+            case PlayerConfigurationConnection conn -> {
+                UUID uuid = conn.getProfile().getId();
+                yield Objects.requireNonNullElse(uuid, NULL_UUID);
+            }
+            case PlayerLoginConnection conn -> {
+                PlayerProfile prof = conn.getAuthenticatedProfile();
+                UUID uuid = prof == null ? NULL_UUID : prof.getId();
+                yield Objects.requireNonNullElse(uuid, NULL_UUID);
+            }
+            default -> NULL_UUID;
+        };
+        if (this.manager.getStorage().getWhitelist().containsKey(playerId)) {
+            return; // java player is whitelisted, everything is fine
         }
-        OptionalLong bedrockId = FloodgateUtil.getBedrockId(uniqueId);
+
+        OptionalLong bedrockId = FloodgateUtil.getBedrockId(playerId);
         if (bedrockId.isPresent() && this.manager.getStorage().getBedrockWhitelist().containsKey(bedrockId.getAsLong())) {
-            return;
+            return; // bedrock player is whitelisted, everything is fine
         }
-        if (event.getPlayer().hasPermission("cloudbot.bypass-whitelist")) {
-            return;
+
+        if (LuckPermsUtil.hasPermission(playerId, "cloudbot.bypass-whitelist", false)) {
+            return; // bypass permission set
         }
 
         String inviteLink = this.manager.getConfig().getInviteLink();
@@ -48,7 +68,6 @@ public void onLogin(PlayerLoginEvent event) {
             message += "\nYou can join our discord using " + inviteLink + " for whitelisting yourself.";
         }
 
-        event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST,
-                Component.text(message, NamedTextColor.RED));
+        event.kickMessage(Component.text(message, NamedTextColor.RED));
     }
 }

src/main/java/dev/booky/cloudbot/util/LuckPermsUtil.java

@@ -0,0 +1,64 @@
+package dev.booky.cloudbot.util;
+// Created by booky10 in CloudBot (17:55 04.10.2025)
+
+import net.luckperms.api.LuckPerms;
+import net.luckperms.api.LuckPermsProvider;
+import net.luckperms.api.cacheddata.CachedPermissionData;
+import net.luckperms.api.model.user.User;
+import net.luckperms.api.query.QueryOptions;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.jspecify.annotations.NullMarked;
+
+import java.util.UUID;
+
+@NullMarked
+public final class LuckPermsUtil {
+
+    private static final boolean LUCKPERMS;
+
+    static {
+        boolean luckperms = false;
+        try {
+            Class.forName("net.luckperms.api.LuckPerms");
+            luckperms = true;
+        } catch (ClassNotFoundException ignored) {
+        }
+        LUCKPERMS = luckperms;
+    }
+
+    private LuckPermsUtil() {
+    }
+
+    public static boolean hasPermission(UUID playerId, String permission, boolean fallback) {
+        if (LUCKPERMS) {
+            return Handler.hasPermission(playerId, permission, fallback);
+        }
+        Player player = Bukkit.getPlayer(playerId);
+        if (player != null && player.isPermissionSet(permission)) {
+            return player.hasPermission(permission);
+        }
+        return fallback;
+    }
+
+    private static final class Handler {
+
+        private Handler() {
+        }
+
+        public static boolean hasPermission(UUID playerId, String permission, boolean fallback) {
+            LuckPerms api = LuckPermsProvider.get();
+            User user = api.getUserManager().getUser(playerId);
+            if (user == null) {
+                return fallback;
+            }
+            QueryOptions queryOpts = user.getQueryOptions();
+            CachedPermissionData perms = user.getCachedData().getPermissionData(queryOpts);
+            return switch (perms.checkPermission(permission)) {
+                case TRUE -> true;
+                case FALSE -> false;
+                default -> fallback;
+            };
+        }
+    }
+}