Upgrade Paper to 1.21, use Brigadier command system

2026-04-29 06:34:17 +02:00 · 2025-05-01 19:55:55 +02:00
parent fbaaa6ec89
commit 361f66f645
19 changed files with 786 additions and 714 deletions
@@ -0,0 +1,66 @@
+package de.shiewk.smoderation.paper.util;
+
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
+import io.papermc.paper.command.brigadier.CommandSourceStack;
+import io.papermc.paper.command.brigadier.MessageComponentSerializer;
+import io.papermc.paper.command.brigadier.argument.resolvers.selector.PlayerSelectorArgumentResolver;
+import net.kyori.adventure.text.Component;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+import java.util.UUID;
+import java.util.function.Predicate;
+
+import static de.shiewk.smoderation.paper.util.PlayerUtil.UUID_CONSOLE;
+
+public abstract class CommandUtil {
+    private CommandUtil(){}
+
+    public static Predicate<CommandSourceStack> requirePermission(String permission) {
+        return stack -> stack.getSender().hasPermission(permission);
+    }
+
+    public static Player getExecutingPlayer(CommandSourceStack stack) throws CommandSyntaxException {
+        CommandSender sender = stack.getSender();
+        if (sender instanceof Player player) {
+            return player;
+        } else {
+            error("Only players can execute this command.");
+            throw new UnknownError(); // can't happen
+        }
+    }
+
+    public static UUID getSenderUUID(CommandSourceStack stack) throws CommandSyntaxException {
+        CommandSender sender = stack.getSender();
+        if (sender instanceof Player player) {
+            return player.getUniqueId();
+        } else if (sender instanceof ConsoleCommandSender){
+            return UUID_CONSOLE;
+        } else {
+            error("Only players and the console can execute this command.");
+            throw new UnknownError(); // can't happen
+        }
+    }
+
+    public static Player getPlayerSingle(CommandContext<CommandSourceStack> context, String name) throws CommandSyntaxException {
+        @NotNull List<Player> players = context.getArgument(name, PlayerSelectorArgumentResolver.class).resolve(context.getSource());
+        if (players.isEmpty()){
+            CommandUtil.error("Please provide a valid player.");
+        }
+        return players.getFirst();
+    }
+
+    public static void error(String message) throws CommandSyntaxException {
+        throw new CommandSyntaxException(
+                new SimpleCommandExceptionType(null),
+                MessageComponentSerializer.message().serialize(
+                        Component.text(message)
+                )
+        );
+    }
+}