✨ Added ability to add custom requirements to a command instance for more refined permission management.

Author: ImBit

API/src/main/java/xyz/bitsquidd/bits/lib/command/BitsCommand.java

@@ -1,12 +1,17 @@
 package xyz.bitsquidd.bits.lib.command;
 
 import net.kyori.adventure.text.Component;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 import xyz.bitsquidd.bits.lib.command.annotation.Command;
+import xyz.bitsquidd.bits.lib.command.requirement.BitsCommandRequirement;
 import xyz.bitsquidd.bits.lib.command.util.BitsCommandContext;
 import xyz.bitsquidd.bits.lib.sendable.text.Text;
 
+import java.util.Collections;
+import java.util.Set;
+
+@NullMarked
 public abstract class BitsCommand {
 
     protected void onRegister() {
@@ -18,8 +23,12 @@ protected void onUnregister() {
     }
 
     @Command("usage")
-    public void sendUsage(@NotNull final BitsCommandContext ctx) {
+    public void sendUsage(final BitsCommandContext ctx) {
         ctx.respond(Text.of(Component.text("Test from " + getClass().getSimpleName() + "!")));
     }
 
+    public Set<BitsCommandRequirement> getAddedRequirements() {
+        return Collections.emptySet();
+    }
+
 }

API/src/main/java/xyz/bitsquidd/bits/lib/command/util/BitsCommandBuilder.java

@@ -1,6 +1,7 @@
 package xyz.bitsquidd.bits.lib.command.util;
 
 import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import xyz.bitsquidd.bits.lib.command.BitsCommand;
 import xyz.bitsquidd.bits.lib.command.annotation.Command;
@@ -15,15 +16,13 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @NullMarked
 public class BitsCommandBuilder {
+    private @Nullable BitsCommand commandInstance;
     private final Class<? extends BitsCommand> commandClass;
 
     @SuppressWarnings("FieldCanBeLocal")
@@ -35,6 +34,13 @@ public class BitsCommandBuilder {
 
     private final String permissionString;
 
+    // Allow us to build from an instance or a class.
+    // Instances are used only for gathering extra requirements.
+    public BitsCommandBuilder(@Nullable BitsCommand commandInstance) {
+        this(Objects.requireNonNull(commandInstance).getClass());
+        this.commandInstance = commandInstance;
+    }
+
     public BitsCommandBuilder(Class<? extends BitsCommand> commandClass) {
         this.commandClass = commandClass;
 
@@ -93,8 +99,8 @@ public Constructor<?> toConstructor() {
     }
 
 
-    public List<BitsCommandRequirement> getRequirements() {
-        List<BitsCommandRequirement> requirements = new ArrayList<>();
+    public Set<BitsCommandRequirement> getRequirements() {
+        Set<BitsCommandRequirement> requirements = new HashSet<>();
         if (commandName.isEmpty()) requirements.add(PermissionRequirement.of(permissionString));
 
         // Gather permission strings and convert them to requirements.
@@ -113,6 +119,7 @@ public List<BitsCommandRequirement> getRequirements() {
                   .toList());
         }
 
+        if (commandInstance != null) requirements.addAll(commandInstance.getAddedRequirements());
         return requirements;
     }
 

Common/src/main/java/xyz/bitsquidd/bits/example/command/CustomCommandContext.java

@@ -4,7 +4,7 @@
 import io.papermc.paper.command.brigadier.CommandSourceStack;
 import org.jspecify.annotations.NullMarked;
 
-import xyz.bitsquidd.bits.example.text.decorator.CommandDecorator;
+import xyz.bitsquidd.bits.example.text.decorator.impl.CommandDecorator;
 import xyz.bitsquidd.bits.lib.command.CommandReturnType;
 import xyz.bitsquidd.bits.lib.command.util.BitsCommandContext;
 import xyz.bitsquidd.bits.lib.sendable.text.Text;