restructure and add discord4j test stub

Reviewed-on: #8
Double choices missing because PR will not get merged since Javacord seized development

.gitea/workflows/gradle-build.yaml

@@ -38,7 +38,10 @@ jobs:
       run: chmod +x gradlew; ./gradlew assemble
 
     - name: Move artifacts
-      run: mkdir artifacts; mv lib/build/libs/*.jar artifacts; mv wrapper/javacord/build/libs/*.jar artifacts;
+      run: |
+        mkdir artifacts; mv lib/build/libs/*.jar artifacts; 
+        mv wrapper/javacord/build/libs/*.jar artifacts; 
+        mv wrapper/discord4j/build/libs/*.jar artifacts;
 
     - name: Upload artifact
       uses: christopherhx/gitea-upload-artifact@v4

.gitea/workflows/gradle-publish-dev.yaml

@@ -0,0 +1,40 @@
+name: Publish
+
+on:
+  push:
+    branches: [dev]
+
+jobs:
+  Gradle-Publish:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: '23'
+          check-latest: true
+          distribution: 'zulu'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          add-job-summary: always
+          cache-cleanup: on-success
+
+      - name: Cache Gradle dependencies
+        uses: actions/cache@v4
+        with:
+          path: | 
+            ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      - name: Publish Dev
+        env:
+          GITEA_TOKEN: ${{ secrets.PUBLISH_PACKAGE_TOKEN }}
+        run: chmod +x gradlew; ./gradlew publishAllPublicationsToGiteaRepository 

.gitea/workflows/gradle-publish.yaml

@@ -1,11 +1,11 @@
-name: Test
+name: Publish
 
 on:
   push:
     branches: [master]
 
 jobs:
-  Gradle-Test:
+  Gradle-Publish:
     runs-on: ubuntu-latest
 
     steps:
@@ -34,7 +34,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-      - name: Publish
+      - name: Publish Release
         env:
           GITEA_TOKEN: ${{ secrets.PUBLISH_PACKAGE_TOKEN }}
-        run: chmod +x gradlew; ./gradlew publishAllPublicationsToGiteaRepository
+        run: chmod +x gradlew; ./gradlew publishAllPublicationsToGiteaRepository -Prelease

.gitea/workflows/gradle-test.yaml

@@ -44,6 +44,7 @@ jobs:
           mkdir test-results/;
           [ -d lib/build/test-results/test/ ] && mv lib/build/test-results/test/*.xml test-results/;
           [ -d wrapper/javacord/build/test-results/test/ ] && mv wrapper/javacord/build/test-results/test/*.xml test-results/;
+          [ -d wrapper/discord4j/build/test-results/test/ ] && mv wrapper/discord4j/build/test-results/test/*.xml test-results/;
 
       - name: Upload Test Result
         uses: christopherhx/gitea-upload-artifact@v4

build.gradle.kts

@@ -8,6 +8,7 @@ allprojects {
     group = "net.tomatentum.Marinara"
     version = "1.0.0-RC1" + (if (!project.hasProperty("release")) ("-" + getGitHash()) else "")
     description = "A simple but powerful, library-agnostic Discord Interaction Wrapper."
+
 }
 
 subprojects {
@@ -18,6 +19,8 @@ subprojects {
         publishing {
             publications {
                 create<MavenPublication>("maven") {
+                    if (!project.hasProperty("release"))
+                        artifactId = project.getName() + "-dev"
                     from(components["java"])
                 }
             }

gradle/libs.versions.toml

@@ -5,10 +5,12 @@
 junit-jupiter = "5.10.2"
 log4j = "2.24.1"
 javacord = "3.8.0"
+discord4j = "3.2.7"
 geantyref = "2.0.0"
 
 [libraries]
 junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter" }
-log4j = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j"}
+log4j = { module = "org.apache.logging.log4j:log4j-api", version.ref = "log4j"}
 javacord = { module = "org.javacord:javacord", version.ref = "javacord"}
+discord4j = { module = "com.discord4j:discord4j-core", version.ref = "discord4j"}
 geantyref = { module = "io.leangen.geantyref:geantyref", version.ref = "geantyref"}

lib/build.gradle.kts

@@ -21,13 +21,13 @@ dependencies {
 
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
     implementation(libs.log4j)
-
+    implementation(libs.geantyref)
 }
 
 // Apply a specific Java toolchain to ease working on different environments.
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(21)
+        languageVersion = JavaLanguageVersion.of(23)
     }
 }
 

lib/src/main/java/net/tomatentum/marinara/Marinara.java

@@ -1,22 +1,40 @@
 package net.tomatentum.marinara;
 
+import org.apache.logging.log4j.Logger;
+
+import net.tomatentum.marinara.registry.InteractionCheckRegistry;
 import net.tomatentum.marinara.registry.InteractionRegistry;
+import net.tomatentum.marinara.util.LoggerUtil;
 import net.tomatentum.marinara.wrapper.LibraryWrapper;
 
 public class Marinara {
+
+    private Logger logger = LoggerUtil.getLogger(getClass());
     
     public static <T extends LibraryWrapper> Marinara load(LibraryWrapper wrapper) {
-        InteractionRegistry registry = new InteractionRegistry(wrapper);
-        return new Marinara(registry);
+        return new Marinara(wrapper);
     }
 
     private InteractionRegistry registry;
+    private InteractionCheckRegistry checkRegistry;
+    private LibraryWrapper wrapper;
 
-    private Marinara(InteractionRegistry registry) {
-        this.registry = registry;
+    private Marinara(LibraryWrapper wrapper) {
+        this.wrapper = wrapper;
+        this.registry = new InteractionRegistry(this);
+        this.checkRegistry = new InteractionCheckRegistry();
+        logger.info("Marinara loaded successfully!");
     }
 
     public InteractionRegistry getRegistry() {
         return registry;
     }
+
+    public InteractionCheckRegistry getCheckRegistry() {
+        return checkRegistry;
+    }
+
+    public LibraryWrapper getWrapper() {
+        return wrapper;
+    }
 }

lib/src/main/java/net/tomatentum/marinara/checks/AppliedCheck.java

@@ -0,0 +1,50 @@
+package net.tomatentum.marinara.checks;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+
+import org.apache.logging.log4j.Logger;
+
+import net.tomatentum.marinara.util.LoggerUtil;
+import net.tomatentum.marinara.util.ReflectionUtil;
+
+public record AppliedCheck(InteractionCheck<?> check, Annotation annotation) {
+
+    private static Logger logger = LoggerUtil.getLogger(AppliedCheck.class);
+    
+    public boolean pre(Object context) {
+        Method[] methods = Arrays.stream(check.getClass().getMethods())
+            .filter(x -> x.getName().equals("preExec"))
+            .filter(x -> !x.isBridge())
+            .toArray(s -> new Method[s]);
+        Method method = ReflectionUtil.getMostSpecificMethod(methods, context.getClass(), annotation.annotationType());
+        method.setAccessible(true);
+        try {
+            logger.debug("Executing pre check {} with context {}", check.getClass().getName(), context.toString());
+            boolean result = (boolean) method.invoke(check, context, annotation);
+            logger.debug("Pre Check {} {} with context {}", check.getClass().getName(), result ? "succeeded" : "failed", context.toString());
+            return result;
+        } catch (IllegalAccessException | InvocationTargetException | SecurityException e) {
+            logger.fatal(e);
+            return false;
+        }
+    }
+
+    public void post(Object context) {
+        Method[] methods = Arrays.stream(check.getClass().getMethods())
+            .filter(x -> x.getName().equals("postExec"))
+            .filter(x -> !x.isBridge())
+            .toArray(s -> new Method[s]);
+        Method method = ReflectionUtil.getMostSpecificMethod(methods, context.getClass(), annotation.annotationType());
+        method.setAccessible(true);
+        try {
+            logger.debug("Executing post check {} with context {}", check.getClass().getName(), context.toString());
+            method.invoke(check, context, annotation);
+        } catch (IllegalAccessException | InvocationTargetException | SecurityException e) {
+            logger.fatal(e);
+        }
+    }
+
+}

lib/src/main/java/net/tomatentum/marinara/checks/InteractionCheck.java

@@ -0,0 +1,10 @@
+package net.tomatentum.marinara.checks;
+
+import java.lang.annotation.Annotation;
+
+public interface InteractionCheck<A extends Annotation> {
+
+    public boolean preExec(Object context, A annotation);
+    public void postExec(Object context, A annotation);
+    
+}

lib/src/main/java/net/tomatentum/marinara/interaction/annotation/AutoComplete.java

@@ -0,0 +1,12 @@
+package net.tomatentum.marinara.interaction.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface AutoComplete {
+    
+}

lib/src/main/java/net/tomatentum/marinara/interaction/commands/ChoiceValueProvider.java

@@ -0,0 +1,5 @@
+package net.tomatentum.marinara.interaction.commands;
+
+public interface ChoiceValueProvider<T> {
+    T getChoiceValue();
+}

lib/src/main/java/net/tomatentum/marinara/interaction/commands/EnumChoices.java

@@ -0,0 +1,78 @@
+package net.tomatentum.marinara.interaction.commands;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import io.leangen.geantyref.AnnotationFormatException;
+import io.leangen.geantyref.GenericTypeReflector;
+import io.leangen.geantyref.TypeFactory;
+import net.tomatentum.marinara.interaction.commands.annotation.SlashCommandOptionChoice;
+
+public record EnumChoices(Class<? extends Enum<?>> enumClass, ChoiceType type, SlashCommandOptionChoice[] choices) {
+
+    private static Method method;
+
+    static {
+        try {
+            method = ChoiceValueProvider.class.getMethod("getChoiceValue");
+        } catch (NoSuchMethodException | SecurityException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static EnumChoices of(Class<? extends Enum<?>> enumClass) {
+        if (!ChoiceValueProvider.class.isAssignableFrom(enumClass))
+            throw new IllegalArgumentException("Provided class needs to implement the ChoiceValueProvider interface.");
+        ChoiceType type = parseChoiceType(enumClass);
+        SlashCommandOptionChoice[] choices = parseChoices(enumClass, type);
+        return new EnumChoices(enumClass, type, choices);
+    }
+
+    private static ChoiceType parseChoiceType(Class<? extends Enum<?>> enumClass) {
+        ParameterizedType type = (ParameterizedType) GenericTypeReflector.getExactSuperType(enumClass, ChoiceValueProvider.class);
+        Type typeParam = type.getActualTypeArguments()[0];
+
+        if (!(typeParam instanceof Class<?>))
+            throw new IllegalArgumentException("ChoiceValueProvider need either a String or Number type parameter.");
+
+        if (Long.class.isAssignableFrom((Class<?>) typeParam))
+            return ChoiceType.INTEGER;
+        if (Double.class.isAssignableFrom((Class<?>) typeParam))
+            return ChoiceType.DOUBLE;
+        if (String.class.isAssignableFrom((Class<?>) typeParam))
+            return ChoiceType.String;
+        throw new IllegalArgumentException("ChoiceValueProvider need either a String, Number or Decimal type parameter.");
+    }
+
+    private static SlashCommandOptionChoice[] parseChoices(Class<? extends Enum<?>> enumClass, ChoiceType type) {
+        Enum<? extends Enum<?>>[] constants = enumClass.getEnumConstants();
+        List<SlashCommandOptionChoice> choices = new ArrayList<>();
+        for (Enum<? extends Enum<?>> enumInstance : constants) {
+            Object value;
+            try {
+                value = method.invoke(enumInstance);
+                if (type.equals(ChoiceType.INTEGER))
+                    choices.add(TypeFactory.annotation(SlashCommandOptionChoice.class, Map.of("name", enumInstance.name(), "longValue", value)));
+                if (type.equals(ChoiceType.DOUBLE))
+                    choices.add(TypeFactory.annotation(SlashCommandOptionChoice.class, Map.of("name", enumInstance.name(), "doubleValue", value)));
+                if (type.equals(ChoiceType.String))
+                    choices.add(TypeFactory.annotation(SlashCommandOptionChoice.class, Map.of("name", enumInstance.name(), "stringValue", value)));
+            } catch (IllegalAccessException | InvocationTargetException | AnnotationFormatException e) {
+                e.printStackTrace();
+                return null;
+            }
+        }
+        return choices.toArray(SlashCommandOptionChoice[]::new);
+    }
+
+    public static enum ChoiceType {
+        String,
+        INTEGER,
+        DOUBLE
+    }
+}

lib/src/main/java/net/tomatentum/marinara/interaction/commands/ExecutableSlashCommandDefinition.java

@@ -2,8 +2,10 @@ package net.tomatentum.marinara.interaction.commands;
 
 import net.tomatentum.marinara.interaction.commands.annotation.SlashCommand;
 import net.tomatentum.marinara.interaction.commands.annotation.SlashCommandOption;
+import net.tomatentum.marinara.interaction.commands.annotation.SlashCommandOptionChoice;
 import net.tomatentum.marinara.interaction.commands.annotation.SubCommand;
 import net.tomatentum.marinara.interaction.commands.annotation.SubCommandGroup;
+import net.tomatentum.marinara.interaction.commands.annotation.SlashCommandOption.PlaceHolderEnum;
 
 public record ExecutableSlashCommandDefinition(
     SlashCommand applicationCommand,
@@ -11,19 +13,41 @@ public record ExecutableSlashCommandDefinition(
     SubCommandGroup subCommandGroup, 
     SlashCommandOption[] options) {
 
+    public static SlashCommandOptionChoice[] getActualChoices(SlashCommandOption option) {
+        SlashCommandOptionChoice[] choices = option.choices();
+        if (choices.length <= 0 && !option.choiceEnum().equals(PlaceHolderEnum.class))
+            choices = EnumChoices.of(option.choiceEnum()).choices();
+        return choices;
+    }
+
     @Override
     public final boolean equals(Object o) {
         if (!(o instanceof ExecutableSlashCommandDefinition))
             return false;
         ExecutableSlashCommandDefinition other = (ExecutableSlashCommandDefinition) o;
-        return other.applicationCommand.name().equals(this.applicationCommand.name()) && 
-            other.subCommandGroup.name().equals(this.subCommandGroup.name()) &&
-            other.subCommand.name().equals(this.subCommand.name());
+        boolean equals = false;
+
+        if (this.applicationCommand() != null && other.applicationCommand() != null)
+            equals = this.applicationCommand().name().equals(other.applicationCommand().name());
+
+        if (this.subCommandGroup() != null && other.subCommandGroup() != null)
+            equals = this.subCommandGroup().name().equals(other.subCommandGroup().name());
+        
+        if (this.subCommand() != null && other.subCommand() != null)
+            equals = this.subCommand().name().equals(other.subCommand().name());
+
+        return equals;
     }
 
     @Override
     public final String toString() {
-        return applicationCommand.name() + subCommand.name() != null ? "::" + subCommand.name() : "";
+        StringBuilder builder = new StringBuilder();
+        builder.append(applicationCommand.name());
+        if (subCommandGroup != null && subCommandGroup.name() != null)
+            builder.append("::").append(subCommandGroup.name());
+        if (subCommand != null && subCommand.name() != null)
+            builder.append("::").append(subCommand.name());
+        return builder.toString();
     }
 
     public boolean isRootCommand() {

lib/src/main/java/net/tomatentum/marinara/interaction/commands/annotation/SlashCommandOption.java

@@ -14,4 +14,11 @@ public @interface SlashCommandOption {
     public String description() default "";
     public SlashCommandOptionType type() default SlashCommandOptionType.STRING;
     public boolean required() default false;
+    public boolean autocomplete() default false;
+    public SlashCommandOptionChoice[] choices() default {};
+    public Class<? extends Enum<?>> choiceEnum() default PlaceHolderEnum.class;
+
+    public static enum PlaceHolderEnum {
+
+    }
 }

lib/src/main/java/net/tomatentum/marinara/interaction/commands/annotation/SlashCommandOptionChoice.java

@@ -0,0 +1,8 @@
+package net.tomatentum.marinara.interaction.commands.annotation;
+
+public @interface SlashCommandOptionChoice {
+    public String name();
+    public long longValue() default Long.MAX_VALUE;
+    public double doubleValue() default Double.MAX_VALUE;
+    public String stringValue() default "";
+}

lib/src/main/java/net/tomatentum/marinara/interaction/commands/option/SlashCommandOptionType.java

@@ -1,16 +1,35 @@
 package net.tomatentum.marinara.interaction.commands.option;
 
 public enum SlashCommandOptionType {
-    ATTACHMENT,
-    BOOLEAN,
-    CHANNEL,
-    DECIMAL,
-    LONG,
-    MENTIONABLE,
-    ROLE,
-    STRING,
-    SUB_COMMAND,
-    SUB_COMMAND_GROUP,
-    UNKNOW,
-    USER
+    SUB_COMMAND(1),
+    SUB_COMMAND_GROUP(2),
+    STRING(3),
+    INTEGER(4),
+    BOOLEAN(5),
+    USER(6),
+    CHANNEL(7),
+    ROLE(8),
+    MENTIONABLE(9),
+    DOUBLE(10),
+    ATTACHMENT(11),
+    UNKNOWN(-1);
+
+    private final int value;
+
+    private SlashCommandOptionType(int value) {
+        this.value = value;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+    public static SlashCommandOptionType fromValue(int value) {
+        for (SlashCommandOptionType type : values()) {
+            if (type.getValue() == value) {
+                return type;
+            }
+        }
+        return UNKNOWN;
+    }
 }

lib/src/main/java/net/tomatentum/marinara/interaction/methods/AutoCompleteInteractionMethod.java

@@ -0,0 +1,51 @@
+package net.tomatentum.marinara.interaction.methods;
+
+import java.lang.reflect.Method;
+
+import net.tomatentum.marinara.Marinara;
+import net.tomatentum.marinara.interaction.InteractionHandler;
+import net.tomatentum.marinara.interaction.InteractionType;
+import net.tomatentum.marinara.interaction.commands.ExecutableSlashCommandDefinition;
+import net.tomatentum.marinara.parser.AnnotationParser;
+import net.tomatentum.marinara.parser.SlashCommandParser;
+
+public class AutoCompleteInteractionMethod extends InteractionMethod {
+
+    private ExecutableSlashCommandDefinition commandDefinition;
+
+    public AutoCompleteInteractionMethod(Method method, 
+        InteractionHandler handler, 
+        Marinara marinara
+        ) {
+        super(method, handler, marinara);
+    }
+
+    @Override
+    public AnnotationParser[] getParsers() {
+        return new AnnotationParser[] { 
+            new SlashCommandParser(method, (x) -> { this.commandDefinition = x; } ) 
+        };
+    }
+
+    @Override
+    public Object getParameter(Object context, int index) {
+        Class<?> type = getMethod().getParameterTypes()[index+1];
+        Object autocompleteOptionValue = marinara.getWrapper().getContextObjectProvider().getAutocompleteFocusedOption(context);
+        if (autocompleteOptionValue != null)
+            return autocompleteOptionValue;
+
+        return marinara.getWrapper().getContextObjectProvider().getComponentContextObject(context, type);
+    }
+
+    @Override
+    public boolean canRun(Object context) {
+        ExecutableSlashCommandDefinition other = marinara.getWrapper().getCommandDefinition(context);
+        return commandDefinition.equals(other);
+    }
+
+    @Override
+    public InteractionType getType() {
+        return InteractionType.AUTOCOMPLETE;
+    }
+    
+}

lib/src/main/java/net/tomatentum/marinara/interaction/methods/ButtonInteractionMethod.java

@@ -2,39 +2,41 @@ package net.tomatentum.marinara.interaction.methods;
 
 import java.lang.reflect.Method;
 
+import net.tomatentum.marinara.Marinara;
 import net.tomatentum.marinara.interaction.InteractionHandler;
 import net.tomatentum.marinara.interaction.InteractionType;
-import net.tomatentum.marinara.interaction.annotation.Button;
-import net.tomatentum.marinara.wrapper.LibraryWrapper;
+import net.tomatentum.marinara.parser.AnnotationParser;
+import net.tomatentum.marinara.parser.ButtonParser;
 
 public class ButtonInteractionMethod extends InteractionMethod {
 
     private String customId;
 
-    ButtonInteractionMethod(Method method, InteractionHandler handler, LibraryWrapper wrapper) {
-        super(method, handler, wrapper);
-        parseMethod();
+    ButtonInteractionMethod(Method method, InteractionHandler handler, Marinara marinara) {
+        super(method, handler, marinara);
     }
 
     @Override
-    public Object getParameter(Object parameter, int index) {
+    public AnnotationParser[] getParsers() {
+        return new AnnotationParser[] {
+            new ButtonParser(method, (x) -> { this.customId = x; } )
+        };
+    }
+
+    @Override
+    public Object getParameter(Object context, int index) {
         Class<?> type = getMethod().getParameterTypes()[index+1];
-        return wrapper.getComponentContextObject(parameter, type);
+        return marinara.getWrapper().getContextObjectProvider().getComponentContextObject(context, type);
     }
 
     @Override
     public boolean canRun(Object context) {
-        return wrapper.getButtonId(context).equals(customId);
+        return marinara.getWrapper().getButtonId(context).equals(customId);
     }
 
     @Override
     public InteractionType getType() {
         return InteractionType.BUTTON;
     }
-
-    private void parseMethod() {
-        Button button = getMethod().getAnnotation(Button.class);
-        this.customId = button.value();
-    }
     
 }

lib/src/main/java/net/tomatentum/marinara/interaction/methods/InteractionMethod.java

@@ -7,62 +7,100 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import org.apache.logging.log4j.Logger;
+
+import net.tomatentum.marinara.Marinara;
+import net.tomatentum.marinara.checks.AppliedCheck;
 import net.tomatentum.marinara.interaction.InteractionHandler;
 import net.tomatentum.marinara.interaction.InteractionType;
+import net.tomatentum.marinara.interaction.annotation.AutoComplete;
 import net.tomatentum.marinara.interaction.annotation.Button;
 import net.tomatentum.marinara.interaction.commands.annotation.SlashCommand;
 import net.tomatentum.marinara.interaction.commands.annotation.SubCommand;
-import net.tomatentum.marinara.wrapper.LibraryWrapper;
+import net.tomatentum.marinara.parser.AnnotationParser;
+import net.tomatentum.marinara.parser.InteractionCheckParser;
+import net.tomatentum.marinara.util.LoggerUtil;
+import net.tomatentum.marinara.util.ReflectionUtil;
 
 public abstract class InteractionMethod {
 
-    public static InteractionMethod create(Method method, InteractionHandler handler, LibraryWrapper wrapper) {
+    public static InteractionMethod create(Method method, InteractionHandler handler, Marinara marinara) {
+        if (method.isAnnotationPresent(AutoComplete.class))
+            return new AutoCompleteInteractionMethod(method, handler, marinara);
         if (method.isAnnotationPresent(SlashCommand.class) || method.isAnnotationPresent(SubCommand.class))
-            return new SlashCommandInteractionMethod(method, handler, wrapper);
+            return new SlashCommandInteractionMethod(method, handler, marinara);
         if (method.isAnnotationPresent(Button.class))
-            return new ButtonInteractionMethod(method, handler, wrapper);
+            return new ButtonInteractionMethod(method, handler, marinara);
         return null;
     }
 
     protected Method method;
     protected InteractionHandler handler;
-    protected LibraryWrapper wrapper;
+    protected Marinara marinara;
+    protected List<AnnotationParser> parsers;
+    protected List<AppliedCheck> appliedChecks;
 
-    protected InteractionMethod(Method method, InteractionHandler handler, LibraryWrapper wrapper) {
+    private Logger logger = LoggerUtil.getLogger(getClass());
+
+    protected InteractionMethod(Method method, 
+        InteractionHandler handler, 
+        Marinara marinara
+        ) {
         if (!Arrays.asList(handler.getClass().getMethods()).contains(method))
             throw new InvalidParameterException("Method does not apply to specified handler");
+
         this.method = method;
         this.handler = handler;
-        this.wrapper = wrapper;
+        this.marinara = marinara;
+        this.parsers = new ArrayList<>(Arrays.asList(getParsers()));
+        this.appliedChecks = new ArrayList<>();
+
+        parsers.add(new InteractionCheckParser(method, appliedChecks::add, marinara.getCheckRegistry()));
+
+        parsers.stream().forEach(AnnotationParser::parse);
     }
 
-    public abstract Object getParameter(Object parameter, int index);
+    public abstract AnnotationParser[] getParsers();
+
+    public abstract Object getParameter(Object context, int index);
 
     public abstract boolean canRun(Object context);
 
     public abstract InteractionType getType();
 
     public void run(Object context) {
-        int parameterCount = method.getParameterCount();
-        List<Object> parameters = new ArrayList<>();
-        
-        for (int i = 0; i < parameterCount; i++) {
-            if (i == 0) {
-                parameters.add(context);
-                continue;
-            }
-            parameters.add(getParameter(context, i-1));
-        }
+        if (this.appliedChecks.stream().filter(x -> !x.pre(context)).count() > 0)
+            return;
+
         method.setAccessible(true);
         try {
-            method.invoke(handler, parameters.toArray());
+            method.invoke(handler, getParameters(context));
         }catch (IllegalAccessException | InvocationTargetException ex) {
-            throw new RuntimeException(ex);
+            logger.fatal(ex);
         }
+
+        this.appliedChecks.forEach(x -> x.post(context));
     }
 
     public Method getMethod() {
         return method;
     }
 
+    private Object[] getParameters(Object context) {
+        int parameterCount = method.getParameterCount();
+        List<Object> parameters = new ArrayList<>();
+        
+        for (int i = 0; i < parameterCount; i++) {
+            Object parameter;
+            if (i == 0) {
+                parameter = context;
+            }else
+                parameter = getParameter(context, i-1);
+
+            logger.trace("Found parameter {}={} for method {}", parameter.getClass().toString(), parameter, ReflectionUtil.getFullMethodName(method));
+            parameters.add(parameter);   
+        }
+        return parameters.toArray();
+    }
+
 }

lib/src/main/java/net/tomatentum/marinara/interaction/methods/SlashCommandInteractionMethod.java

@@ -2,32 +2,36 @@ package net.tomatentum.marinara.interaction.methods;
 
 import java.lang.reflect.Method;
 
+import net.tomatentum.marinara.Marinara;
 import net.tomatentum.marinara.interaction.InteractionHandler;
 import net.tomatentum.marinara.interaction.InteractionType;
 import net.tomatentum.marinara.interaction.commands.ExecutableSlashCommandDefinition;
-import net.tomatentum.marinara.interaction.commands.annotation.SlashCommand;
-import net.tomatentum.marinara.interaction.commands.annotation.SubCommand;
-import net.tomatentum.marinara.interaction.commands.annotation.SubCommandGroup;
-import net.tomatentum.marinara.util.ReflectionUtil;
-import net.tomatentum.marinara.wrapper.LibraryWrapper;
+import net.tomatentum.marinara.parser.AnnotationParser;
+import net.tomatentum.marinara.parser.SlashCommandParser;
 
 public class SlashCommandInteractionMethod extends InteractionMethod {
 
     private ExecutableSlashCommandDefinition commandDefinition;
 
-    SlashCommandInteractionMethod(Method method, InteractionHandler handler, LibraryWrapper wrapper) {
-        super(method, handler, wrapper);
-        parseMethod();
+    SlashCommandInteractionMethod(Method method, InteractionHandler handler, Marinara marinara) {
+        super(method, handler, marinara);
+    }
+
+    @Override
+    public AnnotationParser[] getParsers() {
+        return new AnnotationParser[] { 
+            new SlashCommandParser(method, (x) -> { this.commandDefinition = x; } ) 
+        };
     }
 
     @Override
     public Object getParameter(Object context, int index) {
-        return wrapper.convertCommandOption(context, commandDefinition.options()[index].type(), commandDefinition.options()[index].name());
+        return marinara.getWrapper().getContextObjectProvider().convertCommandOption(context, commandDefinition.options()[index].name());
     }
 
     @Override
     public boolean canRun(Object context) {
-        ExecutableSlashCommandDefinition other = wrapper.getCommandDefinition(context);
+        ExecutableSlashCommandDefinition other = marinara.getWrapper().getCommandDefinition(context);
         return commandDefinition.equals(other);
     }
 
@@ -40,24 +44,8 @@ public class SlashCommandInteractionMethod extends InteractionMethod {
         return commandDefinition;
     }
 
-    private void parseMethod() {
-        ReflectionUtil.checkValidCommandMethod(method);
-
-        SlashCommand cmd = ReflectionUtil.getAnnotation(method, SlashCommand.class);
-        ExecutableSlashCommandDefinition.Builder builder = new ExecutableSlashCommandDefinition.Builder();
-        builder.setApplicationCommand(cmd);
-
-        if (ReflectionUtil.isAnnotationPresent(method, SubCommandGroup.class)) {
-            SubCommandGroup cmdGroup = ReflectionUtil.getAnnotation(method, SubCommandGroup.class);
-            builder.setSubCommandGroup(cmdGroup);
-        }
-
-        if (ReflectionUtil.isAnnotationPresent(method, SubCommand.class)) {
-            SubCommand subCmd = ReflectionUtil.getAnnotation(method, SubCommand.class);
-            builder.setSubCommand(subCmd);
-        }
-
-        this.commandDefinition = builder.build();
+    public void setCommandDefinition(ExecutableSlashCommandDefinition commandDefinition) {
+        this.commandDefinition = commandDefinition;
     }
 
 }

lib/src/main/java/net/tomatentum/marinara/parser/AnnotationParser.java

@@ -0,0 +1,8 @@
+package net.tomatentum.marinara.parser;
+
+import java.lang.reflect.Method;
+
+public interface AnnotationParser {
+    void parse();
+    Method getMethod();
+}

lib/src/main/java/net/tomatentum/marinara/parser/ButtonParser.java

@@ -0,0 +1,36 @@
+package net.tomatentum.marinara.parser;
+
+import java.lang.reflect.Method;
+import java.util.function.Consumer;
+
+import org.apache.logging.log4j.Logger;
+
+import net.tomatentum.marinara.interaction.annotation.Button;
+import net.tomatentum.marinara.util.LoggerUtil;
+import net.tomatentum.marinara.util.ReflectionUtil;
+
+public class ButtonParser implements AnnotationParser {
+    
+    private Method method;
+    private Consumer<String> consumer;
+
+    private Logger logger = LoggerUtil.getLogger(getClass());
+
+    public ButtonParser(Method method, Consumer<String> consumer) {
+        this.method = method;
+        this.consumer = consumer;
+    }
+
+    @Override
+    public void parse() {
+        Button button = getMethod().getAnnotation(Button.class);
+        logger.trace("Parsed Button annotation {} for method {}", button.toString(), ReflectionUtil.getFullMethodName(method));
+        this.consumer.accept(button.value());
+    }
+
+    @Override
+    public Method getMethod() {
+        return this.method;
+    }
+    
+}

lib/src/main/java/net/tomatentum/marinara/parser/InteractionCheckParser.java

@@ -0,0 +1,51 @@
+package net.tomatentum.marinara.parser;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Optional;
+import java.util.function.Consumer;
+
+import org.apache.logging.log4j.Logger;
+
+import net.tomatentum.marinara.checks.AppliedCheck;
+import net.tomatentum.marinara.checks.InteractionCheck;
+import net.tomatentum.marinara.registry.InteractionCheckRegistry;
+import net.tomatentum.marinara.util.LoggerUtil;
+import net.tomatentum.marinara.util.ReflectionUtil;
+
+public class InteractionCheckParser implements AnnotationParser {
+
+    private InteractionCheckRegistry checkRegistry;
+    private Method method;
+    private Consumer<AppliedCheck> consumer;
+
+    private Logger logger = LoggerUtil.getLogger(getClass());
+
+    public InteractionCheckParser(Method method, Consumer<AppliedCheck> consumer, InteractionCheckRegistry checkRegistry) {
+        this.checkRegistry = checkRegistry;
+        this.method = method;
+        this.consumer = consumer;
+    }
+
+    @Override
+    public void parse() {
+        Annotation[] annotations = method.getAnnotations();
+        Arrays.stream(annotations).forEach(this::convertAnnotation);
+    }
+
+    private void convertAnnotation(Annotation annotation) {
+            Optional<InteractionCheck<?>> check = this.checkRegistry.getCheckFromAnnotation(annotation.annotationType());
+            if (check.isPresent())  {
+                AppliedCheck appliedCheck = new AppliedCheck(check.get(), annotation);
+                logger.trace("Parsed InteractionCheck {} for annotation {} for method {}", check.getClass().getName(), annotation.toString(), ReflectionUtil.getFullMethodName(method));
+                consumer.accept(appliedCheck);
+            }
+    }
+
+    @Override
+    public Method getMethod() {
+        return this.method;
+    }
+    
+}

lib/src/main/java/net/tomatentum/marinara/parser/SlashCommandParser.java

@@ -0,0 +1,71 @@
+package net.tomatentum.marinara.parser;
+
+import java.lang.reflect.Method;
+import java.util.function.Consumer;
+
+import org.apache.logging.log4j.Logger;
+
+import net.tomatentum.marinara.interaction.commands.ExecutableSlashCommandDefinition;
+import net.tomatentum.marinara.interaction.commands.annotation.SlashCommand;
+import net.tomatentum.marinara.interaction.commands.annotation.SubCommand;
+import net.tomatentum.marinara.interaction.commands.annotation.SubCommandGroup;
+import net.tomatentum.marinara.util.LoggerUtil;
+import net.tomatentum.marinara.util.ReflectionUtil;
+
+public class SlashCommandParser implements AnnotationParser {
+
+    private Method method;
+    private Consumer<ExecutableSlashCommandDefinition> consumer;
+
+    private Logger logger = LoggerUtil.getLogger(getClass());
+
+    public SlashCommandParser(Method method, Consumer<ExecutableSlashCommandDefinition> consumer) {
+        this.method = method;
+        this.consumer = consumer;
+    }
+
+    @Override
+    public void parse() {
+        this.checkValidCommandMethod(method);
+
+        SlashCommand cmd = ReflectionUtil.getAnnotation(method, SlashCommand.class);
+        ExecutableSlashCommandDefinition.Builder builder = new ExecutableSlashCommandDefinition.Builder();
+        builder.setApplicationCommand(cmd);
+
+        if (ReflectionUtil.isAnnotationPresent(method, SubCommandGroup.class)) {
+            SubCommandGroup cmdGroup = ReflectionUtil.getAnnotation(method, SubCommandGroup.class);
+            builder.setSubCommandGroup(cmdGroup);
+        }
+
+        if (ReflectionUtil.isAnnotationPresent(method, SubCommand.class)) {
+            SubCommand subCmd = ReflectionUtil.getAnnotation(method, SubCommand.class);
+            builder.setSubCommand(subCmd);
+        }
+
+        ExecutableSlashCommandDefinition def = builder.build();
+
+        logger.trace("Parsed using SlashCommandParser for method {} with the result:\n{}", ReflectionUtil.getFullMethodName(method), def.toString());
+        consumer.accept(builder.build());
+    }
+
+    @Override
+    public Method getMethod() {
+       return this.method;
+    }
+
+    private void checkValidCommandMethod(Method method) {
+        if (method.isAnnotationPresent(SlashCommand.class) && 
+            method.getDeclaringClass().isAnnotationPresent(SlashCommand.class)) {
+            throw new RuntimeException(method.getName() + ": Can't have ApplicationCommand Annotation on Class and Method");
+        }
+
+        if (!ReflectionUtil.isAnnotationPresent(method, SlashCommand.class))
+            throw new RuntimeException(method.getName() + ": Missing ApplicationCommand Annotation on either Class or Method");
+
+        if ((method.isAnnotationPresent(SubCommand.class) && 
+            !ReflectionUtil.isAnnotationPresent(method, SlashCommand.class))) {
+            throw new RuntimeException(method.getName() + ": Missing ApplicationCommand Annotation on either Method or Class");
+        }
+    }
+    
+}

lib/src/main/java/net/tomatentum/marinara/registry/InteractionCheckRegistry.java

@@ -0,0 +1,40 @@
+package net.tomatentum.marinara.registry;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.logging.log4j.Logger;
+
+import io.leangen.geantyref.GenericTypeReflector;
+import net.tomatentum.marinara.checks.InteractionCheck;
+import net.tomatentum.marinara.util.LoggerUtil;
+
+public class InteractionCheckRegistry {
+    
+    private List<InteractionCheck<?>> checks;
+
+    private Logger logger = LoggerUtil.getLogger(getClass());
+
+    public InteractionCheckRegistry() {
+        this.checks = new ArrayList<>();
+    }
+
+    public void addCheck(InteractionCheck<?> check) {
+        checks.add(check);
+        logger.info("Registered Check {}", check.getClass().getName());
+    }
+
+    public Optional<InteractionCheck<?>> getCheckFromAnnotation(Type annotation) {
+        for (InteractionCheck<?> interactionCheck : checks) {
+            ParameterizedType type = (ParameterizedType) GenericTypeReflector.getExactSuperType(interactionCheck.getClass(), InteractionCheck.class);
+            Type typeParam = type.getActualTypeArguments()[0];
+            if (typeParam.equals(annotation))
+                return Optional.of(interactionCheck);
+        }
+        return Optional.empty();
+    }
+
+}

lib/src/main/java/net/tomatentum/marinara/registry/InteractionRegistry.java

@@ -5,30 +5,37 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
+import org.apache.logging.log4j.Logger;
+
+import net.tomatentum.marinara.Marinara;
 import net.tomatentum.marinara.interaction.InteractionHandler;
 import net.tomatentum.marinara.interaction.InteractionType;
 import net.tomatentum.marinara.interaction.commands.SlashCommandDefinition;
 import net.tomatentum.marinara.interaction.commands.ExecutableSlashCommandDefinition;
 import net.tomatentum.marinara.interaction.methods.SlashCommandInteractionMethod;
+import net.tomatentum.marinara.util.LoggerUtil;
 import net.tomatentum.marinara.interaction.methods.InteractionMethod;
-import net.tomatentum.marinara.wrapper.LibraryWrapper;
 
 public class InteractionRegistry {
+    private Logger logger = LoggerUtil.getLogger(getClass());
     private List<InteractionMethod> interactionMethods;
-    private LibraryWrapper wrapper;
+    private Marinara marinara;
 
-    public InteractionRegistry(LibraryWrapper wrapper) {
+    public InteractionRegistry(Marinara marinara) {
         this.interactionMethods = new ArrayList<>();
-        this.wrapper = wrapper;
-        wrapper.subscribeInteractions(this::handle);
+        this.marinara = marinara;
+        marinara.getWrapper().subscribeInteractions(this::handle);
     }
 
     public void addInteractions(InteractionHandler interactionHandler) {
         for (Method method : interactionHandler.getClass().getMethods()) {
-            InteractionMethod iMethod = InteractionMethod.create(method, interactionHandler, wrapper);
-            if (iMethod != null)
+            InteractionMethod iMethod = InteractionMethod.create(method, interactionHandler, marinara);
+            if (iMethod != null) {
                 this.interactionMethods.add(iMethod);
+                logger.debug("Added {} method from {}", iMethod.getMethod().getName(), interactionHandler.getClass().getSimpleName());
+            }
         }
+        logger.info("Added all Interactions from {}", interactionHandler.getClass().getSimpleName());
     }
 
     public void registerCommands() {
@@ -46,16 +53,26 @@ public class InteractionRegistry {
                 appDef.get().addExecutableCommand(def);
             else
                 defs.add(new SlashCommandDefinition(def.applicationCommand()).addExecutableCommand(def));
+
+            logger.debug("Added Executable Command {}{}{} for registration", 
+                def.applicationCommand().name(), 
+                def.subCommandGroup() == null ? "" : "." + def.subCommandGroup().name(),
+                def.subCommand() == null ? "" : "." + def.subCommand().name()
+                );
         });
 
-        wrapper.registerSlashCommands(defs.toArray(new SlashCommandDefinition[0]));
+        marinara.getWrapper().registerSlashCommands(defs.toArray(SlashCommandDefinition[]::new));
+        logger.info("Registered all SlashCommands");
     }
 
     public void handle(Object context) {
+        InteractionType type = marinara.getWrapper().getInteractionType(context);
+        logger.debug("Received {} interaction ", context);
         interactionMethods.forEach((m) -> {
-            InteractionType type = wrapper.getInteractionType(context.getClass());
-            if (m.getType().equals(type))
+            if (m.getType().equals(type) && m.canRun(context)) {
+                logger.info("Running {} interaction using {}\ncontext: {}", type, m.getMethod().toString(), context.toString());
                 m.run(context);
+            }
         });
     }
 }

lib/src/main/java/net/tomatentum/marinara/util/LoggerUtil.java

@@ -0,0 +1,24 @@
+package net.tomatentum.marinara.util;
+
+import java.util.Properties;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.simple.SimpleLogger;
+import org.apache.logging.log4j.util.PropertiesUtil;
+import org.apache.logging.log4j.util.ProviderUtil;
+
+public class LoggerUtil {
+    public static Logger getLogger(String name) {
+        if (ProviderUtil.hasProviders()) {
+            return LogManager.getLogger(name);
+        }else
+            return new SimpleLogger(name, Level.DEBUG, true, false, true, true, "yyyy-MM-dd HH:mm:ss.SSSZ", null,
+                                                 new PropertiesUtil(new Properties()), System.out);
+    }
+
+    public static Logger getLogger(Class<?> clazz) {
+        return getLogger(clazz.getName());
+    }
+}

lib/src/main/java/net/tomatentum/marinara/util/ReflectionUtil.java

@@ -2,9 +2,10 @@ package net.tomatentum.marinara.util;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
-
-import net.tomatentum.marinara.interaction.commands.annotation.SlashCommand;
-import net.tomatentum.marinara.interaction.commands.annotation.SubCommand;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
 
 public final class ReflectionUtil {
 
@@ -21,19 +22,86 @@ public final class ReflectionUtil {
             method.getDeclaringClass().getAnnotation(annotationClass);
     }
 
-    public static void checkValidCommandMethod(Method method) {
-        if (method.isAnnotationPresent(SlashCommand.class) && 
-            method.getDeclaringClass().isAnnotationPresent(SlashCommand.class)) {
-            throw new RuntimeException(method.getName() + ": Can't have ApplicationCommand Annotation on Class and Method");
+    public static int getCastDepth(Class<?> child, Class<?> parent) {
+
+        if (parent.equals(Object.class))
+            return Integer.MAX_VALUE;
+
+        if (!parent.isAssignableFrom(child)) {
+            throw new IllegalArgumentException("The specified class is not a child class of the specified parent.");
         }
 
-        if (!isAnnotationPresent(method, SlashCommand.class))
-            throw new RuntimeException(method.getName() + ": Missing ApplicationCommand Annotation on either Class or Method");
+        int depth = 0;
+        Class<?> curr = child;
+        List<Class<?>> parents = new ArrayList<>();
 
-        if ((method.isAnnotationPresent(SubCommand.class) && 
-            !isAnnotationPresent(method, SlashCommand.class))) {
-            throw new RuntimeException(method.getName() + ": Missing ApplicationCommand Annotation on either Method or Class");
+        while (!curr.equals(parent)) {
+            depth++;
+            parents.add(curr.getSuperclass());
+            parents.addAll(Arrays.asList(curr.getInterfaces()));
+
+            for (Class<?> currParent : parents) {
+                if (currParent != null && parent.isAssignableFrom(currParent)) {
+                    curr = currParent;
+                    break;
+                }
+            }
+            parents.clear();
         }
+
+        return depth;
     }
     
+    public static Method getMostSpecificMethod(Method[] methods, Class<?>... parameters) {
+        List<Method> compatibleMethods = Arrays.stream(methods)
+            .filter(x -> isMethodCallable(x, parameters))
+            .toList();
+
+        if (compatibleMethods.size() == 0)
+            throw new IllegalArgumentException("There are no compatible Methods provided");
+
+        for (int i = 0; i < parameters.length; i++) {
+            final int currI = i;
+            Class<?>[] parameterTypes = compatibleMethods.stream()
+                .map(x -> x.getParameterTypes()[currI])
+                .toArray(x -> new Class[x]);
+
+            Class<?> mostSpecific = getMostSpecificClass(parameterTypes, parameters[i]);
+
+            compatibleMethods = compatibleMethods.stream()
+                .filter(x -> Objects.equals(x.getParameterTypes()[currI], mostSpecific))
+                .toList();
+        }
+        
+        return compatibleMethods.getFirst();
+    }
+
+    public static Class<?> getMostSpecificClass(Class<?>[] classes, Class<?> base) {
+        int min = Integer.MAX_VALUE;
+        Class<?> currMostSpecific = null;
+        for (Class<?> currClass : classes) {
+            int currCastDepth = getCastDepth(base, currClass);
+            if (currCastDepth <= min) {
+                min = currCastDepth;
+                currMostSpecific = currClass;
+            }
+        }
+        return currMostSpecific;
+    }
+
+    public static boolean isMethodCallable(Method method, Class<?>... parameters) {
+        if (!Objects.equals(method.getParameterCount(), parameters.length))
+            return false;
+
+        Class<?>[] methodParams = method.getParameterTypes();
+        for (int i = 0; i < parameters.length; i++) {
+            if (!methodParams[i].isAssignableFrom(parameters[i]))
+                return false;
+        }
+        return true;
+    }
+
+    public static String getFullMethodName(Method method) {
+        return method.getClass().getName() + "." + method.getName();
+    }
 }

lib/src/main/java/net/tomatentum/marinara/wrapper/ContextObjectProvider.java

@@ -0,0 +1,11 @@
+package net.tomatentum.marinara.wrapper;
+
+public interface ContextObjectProvider {
+
+    public Object convertCommandOption(Object context, String optionName);
+
+    public Object getComponentContextObject(Object context, Class<?> type);
+    public Object getInteractionContextObject(Object context, Class<?> type);
+
+    public Object getAutocompleteFocusedOption(Object context);
+}

lib/src/main/java/net/tomatentum/marinara/wrapper/LibraryWrapper.java

@@ -6,7 +6,6 @@ import java.util.function.Consumer;
 
 import net.tomatentum.marinara.interaction.commands.SlashCommandDefinition;
 import net.tomatentum.marinara.interaction.commands.ExecutableSlashCommandDefinition;
-import net.tomatentum.marinara.interaction.commands.option.SlashCommandOptionType;
 import net.tomatentum.marinara.interaction.InteractionType;
 
 public abstract class LibraryWrapper {
@@ -17,7 +16,6 @@ public abstract class LibraryWrapper {
         interactionSubscriber = new ArrayList<>();
     }
 
-
     public void handleInteraction(Object context) {
         interactionSubscriber.forEach((o) -> o.accept(context));
     }
@@ -29,12 +27,13 @@ public abstract class LibraryWrapper {
         interactionSubscriber.remove(consumer);
     }
 
-    public abstract InteractionType getInteractionType(Class<?> clazz);
+    public abstract InteractionType getInteractionType(Object context);
 
     public abstract void registerSlashCommands(SlashCommandDefinition[] defs); 
-    public abstract Object convertCommandOption(Object context, SlashCommandOptionType type, String optionName);
     public abstract ExecutableSlashCommandDefinition getCommandDefinition(Object context);
 
     public abstract String getButtonId(Object context);
-    public abstract Object getComponentContextObject(Object context, Class<?> type);
+
+    public abstract ContextObjectProvider getContextObjectProvider();
+
 }

settings.gradle.kts

@@ -13,5 +13,9 @@ plugins {
 rootProject.name = "Marinara"
 include(":lib")
 include(":wrapper-javacord")
+include(":wrapper-discord4j")
+
 
 project(":wrapper-javacord").projectDir = file("wrapper/javacord")
+project(":wrapper-discord4j").projectDir = file("wrapper/discord4j")
+

wrapper/discord4j/build.gradle.kts

@@ -0,0 +1,41 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ *
+ * This generated file contains a sample Java library project to get you started.
+ * For more details on building Java & JVM projects, please refer to https://docs.gradle.org/8.8/userguide/building_java_projects.html in the Gradle documentation.
+ */
+
+plugins {
+    // Apply the java-library plugin for API and implementation separation.
+    `java-library`
+}
+
+repositories {
+    // Use Maven Central for resolving dependencies.
+    mavenCentral()
+}
+
+dependencies {
+    // Use JUnit Jupiter for testing.
+    testImplementation(libs.junit.jupiter)
+
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+    implementation(libs.log4j)
+    implementation(libs.discord4j) {
+        exclude(module="discord4j-voice")
+    }
+    implementation(libs.geantyref)
+    implementation(project(":lib"))
+}
+
+// Apply a specific Java toolchain to ease working on different environments.
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(23)
+    }
+}
+
+tasks.named<Test>("test") {
+    // Use JUnit Platform for unit tests.
+    useJUnitPlatform()
+}

wrapper/discord4j/src/main/java/net/tomatentum/marinara/wrapper/discord4j/Discord4JContextObjectProvider.java

@@ -0,0 +1,102 @@
+package net.tomatentum.marinara.wrapper.discord4j;
+
+import java.util.List;
+
+import discord4j.core.event.domain.interaction.ChatInputAutoCompleteEvent;
+import discord4j.core.event.domain.interaction.ChatInputInteractionEvent;
+import discord4j.core.event.domain.interaction.ComponentInteractionEvent;
+import discord4j.core.object.command.ApplicationCommandInteractionOption;
+import net.tomatentum.marinara.interaction.commands.option.SlashCommandOptionType;
+import net.tomatentum.marinara.wrapper.ContextObjectProvider;
+
+public class Discord4JContextObjectProvider implements ContextObjectProvider {
+
+    @Override
+    public Object convertCommandOption(Object context, String optionName) {
+        if (!(context instanceof ChatInputInteractionEvent))
+            return null;
+        ChatInputInteractionEvent interactionEvent = (ChatInputInteractionEvent) context;
+
+        List<ApplicationCommandInteractionOption> subOptions = Discord4JWrapper.SUB_FILTER.apply(interactionEvent.getOptions());
+
+        if (subOptions.isEmpty())
+            return getOptionValue(interactionEvent.getOption(optionName).get());
+
+
+        ApplicationCommandInteractionOption subCommandOption = interactionEvent.getOptions().getFirst();
+        subOptions = Discord4JWrapper.SUB_FILTER.apply(subCommandOption.getOptions());
+
+        if (!subOptions.isEmpty())
+            subCommandOption = subOptions.getFirst();
+
+        return getOptionValue(interactionEvent.getOption(optionName).get());
+
+    }
+
+    private Object getOptionValue(ApplicationCommandInteractionOption option) {
+        if (!option.getValue().isPresent())
+            return null;
+        SlashCommandOptionType type = getOptionType(option);
+
+        switch (type) {
+            case ATTACHMENT:
+                return option.getValue().get().asAttachment();
+            case BOOLEAN:
+                return option.getValue().get().asBoolean();
+            case CHANNEL:
+                return option.getValue().get().asChannel();
+            case DOUBLE:
+                return option.getValue().get().asDouble();
+            case INTEGER:
+                return option.getValue().get().asLong();
+            case MENTIONABLE:
+                return option.getValue().get().asSnowflake();
+            case ROLE:
+                return option.getValue().get().asRole();
+            case STRING:
+                return option.getValue().get().asString();
+            case USER:
+                return option.getValue().get().asUser();
+            default:
+                return null;
+        }
+    }
+
+    private SlashCommandOptionType getOptionType(ApplicationCommandInteractionOption option) {
+        return SlashCommandOptionType.fromValue(option.getType().getValue());
+    }
+
+    @Override
+    public Object getComponentContextObject(Object context, Class<?> type) {
+        ComponentInteractionEvent componentInteractionEvent = (ComponentInteractionEvent) context;
+        switch (type.getName()) {
+            case "discord4j.core.object.entity.Message":
+                return componentInteractionEvent.getMessage();
+            default:
+                return getInteractionContextObject(context, type);
+        }
+    }
+
+    @Override
+    public Object getInteractionContextObject(Object context, Class<?> type) {
+        ComponentInteractionEvent componentInteractionEvent = (ComponentInteractionEvent) context;
+        switch (type.getName()) {
+            case "discord4j.core.object.entity.channel.MessageChannel":
+                return componentInteractionEvent.getInteraction().getChannel().block();
+            case "discord4j.core.object.entity.Guild":
+                return componentInteractionEvent.getInteraction().getGuild().block();
+            case "discord4j.core.object.entity.Member":
+                return componentInteractionEvent.getInteraction().getMember().orElse(null);
+            case "discord4j.core.object.entity.User":
+                return componentInteractionEvent.getInteraction().getUser();
+        }
+        return null;
+    }
+
+    @Override
+    public Object getAutocompleteFocusedOption(Object context) {
+        ChatInputAutoCompleteEvent interaction = (ChatInputAutoCompleteEvent) context;
+        return getOptionValue(interaction.getFocusedOption());
+    }
+
+}

wrapper/discord4j/src/main/java/net/tomatentum/marinara/wrapper/discord4j/Discord4JWrapper.java

@@ -0,0 +1,201 @@
+package net.tomatentum.marinara.wrapper.discord4j;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+import org.apache.logging.log4j.Logger;
+
+import discord4j.core.GatewayDiscordClient;
+import discord4j.core.event.domain.interaction.ButtonInteractionEvent;
+import discord4j.core.event.domain.interaction.ChatInputAutoCompleteEvent;
+import discord4j.core.event.domain.interaction.ChatInputInteractionEvent;
+import discord4j.core.event.domain.interaction.InteractionCreateEvent;
+import discord4j.core.object.command.ApplicationCommandInteractionOption;
+import discord4j.core.object.command.ApplicationCommandOption.Type;
+import discord4j.discordjson.json.ApplicationCommandOptionChoiceData;
+import discord4j.discordjson.json.ApplicationCommandOptionData;
+import discord4j.discordjson.json.ApplicationCommandRequest;
+
+import io.leangen.geantyref.AnnotationFormatException;
+import io.leangen.geantyref.TypeFactory;
+import net.tomatentum.marinara.interaction.InteractionType;
+import net.tomatentum.marinara.interaction.commands.ExecutableSlashCommandDefinition;
+import net.tomatentum.marinara.interaction.commands.SlashCommandDefinition;
+import net.tomatentum.marinara.interaction.commands.annotation.SlashCommand;
+import net.tomatentum.marinara.interaction.commands.annotation.SlashCommandOption;
+import net.tomatentum.marinara.interaction.commands.annotation.SlashCommandOptionChoice;
+import net.tomatentum.marinara.interaction.commands.annotation.SubCommand;
+import net.tomatentum.marinara.interaction.commands.annotation.SubCommandGroup;
+import net.tomatentum.marinara.util.LoggerUtil;
+import net.tomatentum.marinara.wrapper.ContextObjectProvider;
+import net.tomatentum.marinara.wrapper.LibraryWrapper;
+import reactor.core.publisher.Mono;
+
+public class Discord4JWrapper extends LibraryWrapper {
+
+    public static final Function<List<ApplicationCommandInteractionOption>, List<ApplicationCommandInteractionOption>> SUB_FILTER = (i) ->
+        i.stream()
+            .filter(o -> o.getType().equals(Type.SUB_COMMAND) || o.getType().equals(Type.SUB_COMMAND_GROUP))
+            .toList();
+    
+    public static final Function<List<ApplicationCommandInteractionOption>, List<ApplicationCommandInteractionOption>> ARG_FILTER = (i) ->
+            i.stream()
+                .filter(o -> !o.getType().equals(Type.SUB_COMMAND) && !o.getType().equals(Type.SUB_COMMAND_GROUP))
+                .toList();
+
+    private GatewayDiscordClient api;
+    private Discord4JContextObjectProvider contextObjectProvider;
+
+    private Logger logger = LoggerUtil.getLogger(getClass());
+
+    public Discord4JWrapper(GatewayDiscordClient api) {
+        this.api = api;
+        this.contextObjectProvider = new Discord4JContextObjectProvider();
+        api.on(InteractionCreateEvent.class)
+            .subscribe(event -> handleInteraction(event));
+        Mono.just("test").subscribe(logger::debug);
+            
+        logger.info("Discord4J wrapper loaded!");
+    }
+
+    @Override
+    public InteractionType getInteractionType(Object context) {
+        if (ChatInputAutoCompleteEvent.class.isAssignableFrom(context.getClass()))
+            return InteractionType.AUTOCOMPLETE;
+        if (ChatInputInteractionEvent.class.isAssignableFrom(context.getClass()))
+            return InteractionType.COMMAND;
+        if (ButtonInteractionEvent.class.isAssignableFrom(context.getClass()))
+            return InteractionType.BUTTON;
+
+        return null;
+    }
+
+    @Override
+    public void registerSlashCommands(SlashCommandDefinition[] defs) {
+        HashMap<Long, List<ApplicationCommandRequest>> serverCommands = new HashMap<>();
+        List<ApplicationCommandRequest> globalCommands = new ArrayList<>();
+        long applicationId = api.getRestClient().getApplicationId().block();
+
+        for (SlashCommandDefinition slashCommandDefinition : defs) {
+            ApplicationCommandRequest request = convertSlashCommand(slashCommandDefinition);
+            if (slashCommandDefinition.getFullSlashCommand().serverIds().length > 0) {
+                for (long serverId : slashCommandDefinition.getFullSlashCommand().serverIds()) {
+                    serverCommands.putIfAbsent(serverId, new ArrayList<>());
+                    serverCommands.get(serverId).add(request);
+                }
+            }else
+                globalCommands.add(request);
+        }
+
+        for (long serverId : serverCommands.keySet()) {
+            api.getRestClient().getApplicationService().bulkOverwriteGuildApplicationCommand(applicationId, serverId, serverCommands.get(serverId));
+        }
+        api.getRestClient().getApplicationService().bulkOverwriteGlobalApplicationCommand(applicationId, globalCommands);
+    }
+
+    @Override
+    public ExecutableSlashCommandDefinition getCommandDefinition(Object context) {
+        if (!(context instanceof ChatInputInteractionEvent))
+            return null;
+
+        ChatInputInteractionEvent interaction = (ChatInputInteractionEvent) context;
+        ExecutableSlashCommandDefinition.Builder builder = new ExecutableSlashCommandDefinition.Builder();
+        List<ApplicationCommandInteractionOption> options = SUB_FILTER.apply(interaction.getOptions());
+
+        try {
+            builder.setApplicationCommand(TypeFactory.annotation(SlashCommand.class, Map.of("name", interaction.getCommandName())));
+            if (!options.isEmpty()) {
+                if (!ARG_FILTER.apply(options.getFirst().getOptions()).isEmpty()) {
+                    builder.setSubCommandGroup(TypeFactory.annotation(SubCommandGroup.class, Map.of("name", options.getFirst().getName())));
+                    builder.setSubCommand(TypeFactory.annotation(SubCommand.class, Map.of("name", SUB_FILTER.apply(options.getFirst().getOptions()).getFirst().getName())));
+                }else
+                    builder.setSubCommand(TypeFactory.annotation(SubCommand.class, Map.of("name", options.getFirst().getName())));
+            }
+        } catch (AnnotationFormatException e) {
+            logger.fatal(e);
+        }
+
+        return builder.build();
+    }
+
+    private ApplicationCommandRequest convertSlashCommand(SlashCommandDefinition def) {
+        List<ApplicationCommandOptionData> options = new ArrayList<>();
+        SlashCommand cmd = def.getFullSlashCommand();
+        if (!def.isRootCommand()) {
+            Arrays.stream(def.getSubCommands(null)).map(this::convertSubCommandDef).forEach(options::add);
+            Arrays.stream(def.getSubCommandGroups()).map((x) -> convertSubCommandGroupDef(def, x)).forEach(options::add);
+        }else {
+            Arrays.stream(cmd.options()).map(this::convertOptionDef).forEach(options::add);
+        }
+
+        return ApplicationCommandRequest.builder()
+            .name(cmd.name())
+            .description(cmd.description())
+            .options(options)
+            .build();
+    }
+
+    private ApplicationCommandOptionData convertSubCommandGroupDef(SlashCommandDefinition def, SubCommandGroup subGroup) {
+        SubCommand[] subCommands = def.getSubCommands(subGroup.name());
+        List<ApplicationCommandOptionData> convertedSubCommands = Arrays.stream(subCommands).map(this::convertSubCommandDef).toList();
+        return ApplicationCommandOptionData.builder()
+            .type(Type.SUB_COMMAND_GROUP.getValue())
+            .name(subGroup.name())
+            .description(subGroup.description())
+            .options(convertedSubCommands)
+            .build();
+    }
+
+    private ApplicationCommandOptionData convertSubCommandDef(SubCommand sub) {
+        List<ApplicationCommandOptionData> convertedOptions = Arrays.stream(sub.options()).map(this::convertOptionDef).toList();
+        return ApplicationCommandOptionData.builder()
+            .type(Type.SUB_COMMAND_GROUP.getValue())
+            .name(sub.name())
+            .description(sub.description())
+            .options(convertedOptions)
+            .build();
+    }
+
+    private ApplicationCommandOptionData convertOptionDef(SlashCommandOption option) {
+        Type type = Enum.valueOf(Type.class, option.type().toString());
+        return ApplicationCommandOptionData.builder()
+            .type(type.getValue())
+            .name(option.name())
+            .description(option.description())
+            .required(option.required())
+            .autocomplete(option.autocomplete())
+            .choices(convertChoices(option))
+            .build();
+    }
+
+    private List<ApplicationCommandOptionChoiceData> convertChoices(SlashCommandOption option) {
+        List<ApplicationCommandOptionChoiceData> convertedChoices = new ArrayList<>();
+        for (SlashCommandOptionChoice choice : ExecutableSlashCommandDefinition.getActualChoices(option)) {
+            var builder = ApplicationCommandOptionChoiceData.builder();
+            builder.name(choice.name());
+            if (choice.longValue() != Long.MAX_VALUE)
+                builder.value(choice.longValue());
+            if (choice.doubleValue() != Double.MAX_VALUE)
+                builder.value(choice.doubleValue());
+            if (!choice.stringValue().isEmpty())
+                builder.value(choice.stringValue());
+        }
+        return convertedChoices;
+    }
+
+    @Override
+    public String getButtonId(Object context) {
+        ButtonInteractionEvent button = (ButtonInteractionEvent) context;
+        return button.getCustomId();
+    }
+
+    @Override
+    public ContextObjectProvider getContextObjectProvider() {
+        return this.contextObjectProvider;
+    }
+    
+}

wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/AutoCompleteTest.java

@@ -0,0 +1,23 @@
+package net.tomatentum.marinara.test.discord4j;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import net.tomatentum.marinara.Marinara;
+import net.tomatentum.marinara.test.discord4j.mocks.AutocompleteInteractionMock;
+import net.tomatentum.marinara.test.discord4j.mocks.DiscordApiMock;
+import net.tomatentum.marinara.wrapper.LibraryWrapper;
+import net.tomatentum.marinara.wrapper.javacord.JavacordWrapper;
+
+public class AutoCompleteTest {
+    
+    @Test
+    public void testAutocomplete() {
+        LibraryWrapper wrapper = new JavacordWrapper(new DiscordApiMock()); //null okay as we don't use the discord API in this test.
+        Marinara marinara = Marinara.load(wrapper);
+        marinara.getRegistry().addInteractions(new TestAutocomplete());
+        wrapper.handleInteraction(new AutocompleteInteractionMock());
+        assertTrue(AutocompleteInteractionMock.didAutocompleteRun);
+    }
+}

wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/ButtonTest.java

@@ -0,0 +1,27 @@
+package net.tomatentum.marinara.test.discord4j;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestInstance.Lifecycle;
+
+import net.tomatentum.marinara.Marinara;
+import net.tomatentum.marinara.test.discord4j.mocks.ButtonInteractionMock;
+import net.tomatentum.marinara.test.discord4j.mocks.DiscordApiMock;
+import net.tomatentum.marinara.wrapper.LibraryWrapper;
+import net.tomatentum.marinara.wrapper.javacord.JavacordWrapper;
+
+@TestInstance(Lifecycle.PER_CLASS)
+public class ButtonTest {
+
+    @Test
+    public void testButtonExecution() {
+        LibraryWrapper wrapper = new JavacordWrapper(new DiscordApiMock()); //null okay as we don't use the discord API in this test.
+        Marinara marinara = Marinara.load(wrapper);
+        marinara.getRegistry().addInteractions(new TestButton());
+        wrapper.handleInteraction(new ButtonInteractionMock("test"));
+        assertTrue(TestButton.didRun);
+    }
+    
+}

wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/InteractionCheckTest.java

@@ -0,0 +1,47 @@
+package net.tomatentum.marinara.test.discord4j;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.javacord.api.entity.permission.PermissionType;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestInstance.Lifecycle;
+
+import net.tomatentum.marinara.Marinara;
+import net.tomatentum.marinara.test.discord4j.mocks.ButtonInteractionMock;
+import net.tomatentum.marinara.test.discord4j.mocks.DiscordApiMock;
+import net.tomatentum.marinara.test.discord4j.mocks.ServerMock;
+import net.tomatentum.marinara.wrapper.LibraryWrapper;
+import net.tomatentum.marinara.wrapper.javacord.JavacordWrapper;
+import net.tomatentum.marinara.wrapper.javacord.checks.PermissionCheck;
+
+@TestInstance(Lifecycle.PER_CLASS)
+public class InteractionCheckTest {
+    
+    @Test
+    public void testInteractionCheck() {
+        LibraryWrapper wrapper = new JavacordWrapper(new DiscordApiMock());
+        Marinara marinara = Marinara.load(wrapper);
+        marinara.getCheckRegistry().addCheck(new TestInteractionCheck());
+        marinara.getRegistry().addInteractions(new TestButton());
+        wrapper.handleInteraction(new ButtonInteractionMock("test"));
+        assertTrue(TestInteractionCheck.preExecuted);
+        assertTrue(TestInteractionCheck.postExecuted);
+    }
+
+    @Test
+    public void testPermissionCheck() {
+        LibraryWrapper wrapper = new JavacordWrapper(new DiscordApiMock());
+        Marinara marinara = Marinara.load(wrapper);
+        marinara.getCheckRegistry().addCheck(new PermissionCheck());
+        marinara.getRegistry().addInteractions(new TestButton());
+        wrapper.handleInteraction(new ButtonInteractionMock("permissionCheck"));
+        assertTrue(TestButton.didPermRun);
+        TestButton.didPermRun = false;
+        ServerMock.TESTPERMISSION = PermissionType.ATTACH_FILE;
+        wrapper.handleInteraction(new ButtonInteractionMock("permissionCheck"));
+        assertFalse(TestButton.didPermRun);
+    }
+
+}

wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/SlashCommandTest.java

@@ -0,0 +1,53 @@
+package net.tomatentum.marinara.test.discord4j;
+
+import org.javacord.api.DiscordApi;
+import org.javacord.api.DiscordApiBuilder;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestInstance.Lifecycle;
+
+import net.tomatentum.marinara.Marinara;
+import net.tomatentum.marinara.test.discord4j.mocks.SlashCommandInteractionMock;
+import net.tomatentum.marinara.wrapper.LibraryWrapper;
+import net.tomatentum.marinara.wrapper.javacord.JavacordWrapper;
+@TestInstance(Lifecycle.PER_CLASS)
+public class SlashCommandTest {
+
+    String DISCORD_TOKEN = System.getenv("DISCORD_TEST_TOKEN");
+    DiscordApi api;
+
+    @BeforeAll
+    void setUp() {
+        api = new DiscordApiBuilder()
+        .setToken(DISCORD_TOKEN)
+        .login().join();
+    }
+
+    @AfterAll
+    void tearDown() {
+        api.disconnect();
+        api = null;
+    }
+
+    @Test
+    void testSlashCommand() {
+        Marinara marinara = Marinara.load(new JavacordWrapper(api));
+        marinara.getRegistry().addInteractions(new TestCommand());
+        marinara.getRegistry().registerCommands();
+        System.out.println("Success!");
+    }
+    
+    @Test
+    void testSlashCommandExecution() {
+        LibraryWrapper wrapper = new JavacordWrapper(api);
+        Marinara marinara = Marinara.load(wrapper);
+        marinara.getRegistry().addInteractions(new TestCommand());
+
+        wrapper.handleInteraction(new SlashCommandInteractionMock());
+    }
+
+    
+
+}

wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/TestAutocomplete.java

@@ -0,0 +1,23 @@
+package net.tomatentum.marinara.test.discord4j;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Collections;
+
+import org.javacord.api.interaction.AutocompleteInteraction;
+
+import net.tomatentum.marinara.interaction.InteractionHandler;
+import net.tomatentum.marinara.interaction.annotation.AutoComplete;
+import net.tomatentum.marinara.interaction.commands.annotation.SlashCommand;
+
+public class TestAutocomplete implements InteractionHandler {
+    
+    @SlashCommand(name = "test")
+    @AutoComplete
+    public void autocomplete(AutocompleteInteraction context, String value) {
+        System.out.println("Success!");
+        assertEquals(value, "test");
+        context.respondWithChoices(Collections.emptyList());
+    }
+
+}

wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/TestButton.java

@@ -0,0 +1,42 @@
+package net.tomatentum.marinara.test.discord4j;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import org.javacord.api.entity.channel.TextChannel;
+import org.javacord.api.entity.message.Message;
+import org.javacord.api.entity.permission.PermissionType;
+import org.javacord.api.entity.server.Server;
+import org.javacord.api.entity.user.User;
+import org.javacord.api.interaction.ButtonInteraction;
+
+import net.tomatentum.marinara.interaction.InteractionHandler;
+import net.tomatentum.marinara.interaction.annotation.Button;
+import net.tomatentum.marinara.test.discord4j.TestInteractionCheck.TestCheck;
+import net.tomatentum.marinara.wrapper.javacord.checks.PermissionCheck.HasPermission;
+
+public class TestButton implements InteractionHandler {
+
+
+    public static boolean didRun = false;
+    @Button("test")
+    @TestCheck
+    public void exec(ButtonInteraction interaction, TextChannel channel, Message message, User member, Server server) {
+        assertNotNull(interaction);
+        assertNotNull(channel);
+        assertNotNull(message);
+        assertNotNull(member);
+        assertNotNull(server);
+        didRun = true;
+        System.out.println("Success!");
+    }
+
+    public static boolean didPermRun = false;
+
+    @Button("permissionCheck")
+    @HasPermission({PermissionType.ADMINISTRATOR})
+    public void exec(ButtonInteraction interaction) {
+        didPermRun = true;
+        System.out.println("It worked!");
+    }
+    
+}

wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/TestChoiceEnum.java

@@ -0,0 +1,20 @@
+package net.tomatentum.marinara.test.discord4j;
+
+import net.tomatentum.marinara.interaction.commands.ChoiceValueProvider;
+
+public enum TestChoiceEnum implements ChoiceValueProvider<String> {
+    TestValue("testValue"),
+    FooBar("fooBar"),
+    Spongebob("spongebob");
+
+    private String value;
+
+    private TestChoiceEnum(String value) {
+        this.value = value;
+    }
+    @Override
+    public String getChoiceValue() {
+        return value;
+    }
+    
+}

wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/TestCommand.java

@@ -0,0 +1,32 @@
+package net.tomatentum.marinara.test.discord4j;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.javacord.api.interaction.SlashCommandInteraction;
+
+import net.tomatentum.marinara.interaction.InteractionHandler;
+import net.tomatentum.marinara.interaction.commands.annotation.SlashCommand;
+import net.tomatentum.marinara.interaction.commands.annotation.SlashCommandOption;
+import net.tomatentum.marinara.interaction.commands.option.SlashCommandOptionType;
+
+public class TestCommand implements InteractionHandler {
+    @SlashCommand(
+        name = "test", 
+        description = "testingen",
+        serverIds = {
+            1037753048602255440L
+        },
+        options = {
+            @SlashCommandOption(
+                name = "foo",
+                description = "foo bar is very fooby",
+                type = SlashCommandOptionType.STRING,
+                choiceEnum = TestChoiceEnum.class
+            )
+        }
+        )
+    public void exec(SlashCommandInteraction interaction, String test) {
+        assertEquals(test, "test");
+        System.out.println("Success!");
+    }
+}

wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/TestInteractionCheck.java

@@ -0,0 +1,37 @@
+package net.tomatentum.marinara.test.discord4j;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import net.tomatentum.marinara.checks.InteractionCheck;
+
+public class TestInteractionCheck implements InteractionCheck<TestInteractionCheck.TestCheck> {
+
+    public static boolean preExecuted = false;
+    public static boolean postExecuted = false;
+
+    @Target({ElementType.METHOD})
+    @Retention(RetentionPolicy.RUNTIME)
+    public static @interface TestCheck {
+    }
+
+    @Override
+    public boolean preExec(Object context, TestCheck annotation) {
+        assertNotNull(annotation);
+        assertNotNull(context);
+        preExecuted = true;
+        return true;
+    }
+
+    @Override
+    public void postExec(Object context, TestCheck annotation) {
+        assertNotNull(annotation);
+        assertNotNull(context);
+        postExecuted = true;
+    }
+    
+}

wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/AutocompleteInteractionMock.java

@@ -0,0 +1,17 @@
+package net.tomatentum.marinara.test.discord4j.mocks;
+
+import discord4j.core.GatewayDiscordClient;
+import discord4j.core.event.domain.interaction.ChatInputAutoCompleteEvent;
+import discord4j.core.object.command.Interaction;
+import discord4j.gateway.ShardInfo;
+
+public class AutocompleteInteractionMock extends ChatInputAutoCompleteEvent {
+
+    public AutocompleteInteractionMock(GatewayDiscordClient gateway, ShardInfo shardInfo, Interaction interaction) {
+        super(gateway, shardInfo, interaction);
+        //TODO Auto-generated constructor stub
+    }
+
+    public static boolean didAutocompleteRun = false;
+    
+}

wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/ButtonInteractionMock.java

@@ -0,0 +1,25 @@
+package net.tomatentum.marinara.test.discord4j.mocks;
+
+import discord4j.core.event.domain.interaction.ButtonInteractionEvent;
+import discord4j.core.object.command.Interaction;
+
+public class ButtonInteractionMock extends ButtonInteractionEvent {
+
+    private String customId;
+    
+    public ButtonInteractionMock(String customId) {
+        super(null, null, null);
+        this.customId = customId;
+    }
+
+    @Override
+    public String getCustomId() {
+        return customId;
+    }
+
+    @Override
+    public Interaction getInteraction() {
+        return new InteractionMock();
+    }
+     
+}

wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/ChannelMock.java

@@ -0,0 +1,130 @@
+package net.tomatentum.marinara.test.discord4j.mocks;
+
+import java.time.Instant;
+import java.util.Optional;
+import java.util.function.Consumer;
+
+import org.reactivestreams.Publisher;
+
+import discord4j.common.util.Snowflake;
+import discord4j.core.GatewayDiscordClient;
+import discord4j.core.object.entity.Message;
+import discord4j.core.object.entity.channel.MessageChannel;
+import discord4j.core.retriever.EntityRetrievalStrategy;
+import discord4j.core.spec.MessageCreateSpec;
+import discord4j.core.spec.legacy.LegacyMessageCreateSpec;
+import discord4j.rest.entity.RestChannel;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+public class ChannelMock implements MessageChannel {
+
+    @Override
+    public Type getType() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getType'");
+    }
+
+    @Override
+    public Mono<Void> delete(String reason) {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'delete'");
+    }
+
+    @Override
+    public RestChannel getRestChannel() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getRestChannel'");
+    }
+
+    @Override
+    public Snowflake getId() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getId'");
+    }
+
+    @Override
+    public GatewayDiscordClient getClient() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getClient'");
+    }
+
+    @Override
+    public Optional<Snowflake> getLastMessageId() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getLastMessageId'");
+    }
+
+    @Override
+    public Mono<Message> getLastMessage() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getLastMessage'");
+    }
+
+    @Override
+    public Mono<Message> getLastMessage(EntityRetrievalStrategy retrievalStrategy) {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getLastMessage'");
+    }
+
+    @Override
+    public Optional<Instant> getLastPinTimestamp() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getLastPinTimestamp'");
+    }
+
+    @Override
+    public Mono<Message> createMessage(Consumer<? super LegacyMessageCreateSpec> spec) {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'createMessage'");
+    }
+
+    @Override
+    public Mono<Message> createMessage(MessageCreateSpec spec) {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'createMessage'");
+    }
+
+    @Override
+    public Mono<Void> type() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'type'");
+    }
+
+    @Override
+    public Flux<Long> typeUntil(Publisher<?> until) {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'typeUntil'");
+    }
+
+    @Override
+    public Flux<Message> getMessagesBefore(Snowflake messageId) {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getMessagesBefore'");
+    }
+
+    @Override
+    public Flux<Message> getMessagesAfter(Snowflake messageId) {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getMessagesAfter'");
+    }
+
+    @Override
+    public Mono<Message> getMessageById(Snowflake id) {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getMessageById'");
+    }
+
+    @Override
+    public Mono<Message> getMessageById(Snowflake id, EntityRetrievalStrategy retrievalStrategy) {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getMessageById'");
+    }
+
+    @Override
+    public Flux<Message> getPinnedMessages() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getPinnedMessages'");
+    }
+    
+}

wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/InteractionMock.java

@@ -0,0 +1,41 @@
+package net.tomatentum.marinara.test.discord4j.mocks;
+
+import java.util.Optional;
+
+import discord4j.core.object.command.Interaction;
+import discord4j.core.object.entity.Guild;
+import discord4j.core.object.entity.Message;
+import discord4j.core.object.entity.User;
+import discord4j.core.object.entity.channel.MessageChannel;
+import reactor.core.publisher.Mono;
+
+public class InteractionMock extends Interaction
+ {
+
+    public InteractionMock() {
+        super(null, null);
+    }
+
+    @Override
+    public Optional<Message> getMessage() {
+        //return Optional.of(new MessageMock());
+        return Optional.empty();
+    }
+
+    @Override
+    public Mono<MessageChannel> getChannel() {
+        return Mono.just(new ChannelMock());
+    }
+
+    @Override
+    public Mono<Guild> getGuild() {
+        //return Mono.just(new ServerMock());
+        return Mono.empty();
+    }
+
+    @Override
+    public User getUser() {
+        return new UserMock();
+    }
+    
+}

wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/SlashCommandInteractionMock.java

@@ -0,0 +1,16 @@
+package net.tomatentum.marinara.test.discord4j.mocks;
+
+import discord4j.core.event.domain.interaction.ChatInputInteractionEvent;
+
+public class SlashCommandInteractionMock extends ChatInputInteractionEvent {
+
+    public SlashCommandInteractionMock() {
+        super(null, null, null);
+    }
+
+    @Override
+    public String getCommandName() {
+        return "test";
+    }
+    
+}

wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/SlashCommandInteractionOptionMock.java

@@ -0,0 +1,25 @@
+package net.tomatentum.marinara.test.discord4j.mocks;
+
+import java.util.Optional;
+
+import discord4j.core.object.command.ApplicationCommandInteractionOption;
+import discord4j.core.object.command.ApplicationCommandInteractionOptionValue;
+import discord4j.core.object.command.ApplicationCommandOption.Type;
+
+public class SlashCommandInteractionOptionMock extends ApplicationCommandInteractionOption {
+
+    public SlashCommandInteractionOptionMock() {
+        super(null, null, null, null);
+    }
+
+    @Override
+    public String getName() {
+        return "foo";
+    }
+
+    @Override
+    public Optional<ApplicationCommandInteractionOptionValue> getValue() {
+        return Optional.of(new ApplicationCommandInteractionOptionValue(null, null, Type.STRING.getValue(), "test", null));
+    }
+    
+}

wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/mocks/UserMock.java

@@ -0,0 +1,11 @@
+package net.tomatentum.marinara.test.discord4j.mocks;
+
+import discord4j.core.object.entity.User;
+
+public class UserMock extends User {
+
+    public UserMock() {
+        super(null, null);
+    }
+    
+}

wrapper/javacord/build.gradle.kts

@@ -29,7 +29,7 @@ dependencies {
 // Apply a specific Java toolchain to ease working on different environments.
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(21)
+        languageVersion = JavaLanguageVersion.of(23)
     }
 }
 

wrapper/javacord/src/main/java/net/tomatentum/marinara/wrapper/javacord/JavacordContextObjectProvider.java

@@ -0,0 +1,110 @@
+package net.tomatentum.marinara.wrapper.javacord;
+
+import org.javacord.api.interaction.AutocompleteInteraction;
+import org.javacord.api.interaction.ButtonInteraction;
+import org.javacord.api.interaction.SlashCommandInteraction;
+import org.javacord.api.interaction.SlashCommandInteractionOption;
+import org.javacord.api.interaction.SlashCommandOptionType;
+
+import net.tomatentum.marinara.wrapper.ContextObjectProvider;
+
+public class JavacordContextObjectProvider implements ContextObjectProvider {
+
+    @Override
+    public Object convertCommandOption(Object context, String optionName) {
+        if (!(context instanceof SlashCommandInteraction))
+            return null;
+        SlashCommandInteraction interaction = (SlashCommandInteraction) context;
+        if (!interaction.getArguments().isEmpty())
+            return getOptionValue(interaction.getOptionByName(optionName).get());
+
+        SlashCommandInteractionOption subCommandOption = interaction.getOptions().getFirst();
+
+        if (!subCommandOption.getOptions().isEmpty())
+            subCommandOption = subCommandOption.getOptions().getFirst();
+
+        return getOptionValue(subCommandOption.getOptionByName(optionName).get());
+    }
+
+    private Object getOptionValue(SlashCommandInteractionOption option) {
+        SlashCommandOptionType type = getOptionType(option);
+        switch (type) {
+            case ATTACHMENT:
+                return option.getAttachmentValue().get();
+            case BOOLEAN:
+                return option.getBooleanValue().get();
+            case CHANNEL:
+                return option.getChannelValue().get();
+            case DECIMAL:
+                return option.getDecimalValue().get();
+            case LONG:
+                return option.getLongValue().get();
+            case MENTIONABLE:
+                return option.requestMentionableValue().get();
+            case ROLE:
+                return option.getRoleValue().get();
+            case STRING:
+                return option.getStringValue().get();
+            case USER:
+                return option.requestUserValue().get();
+            default:
+                return null;
+        }
+    }
+
+
+    private SlashCommandOptionType getOptionType(SlashCommandInteractionOption option) {
+        if (option.getAttachmentValue().isPresent())
+            return SlashCommandOptionType.ATTACHMENT;
+        if (option.getBooleanValue().isPresent())
+            return SlashCommandOptionType.BOOLEAN;
+        if (option.getChannelValue().isPresent())
+            return SlashCommandOptionType.CHANNEL;
+        if (option.getDecimalValue().isPresent())
+            return SlashCommandOptionType.DECIMAL;
+        if (option.getLongValue().isPresent())
+            return SlashCommandOptionType.LONG;
+        if (option.requestMentionableValue().isPresent())
+            return SlashCommandOptionType.MENTIONABLE;
+        if (option.getRoleValue().isPresent())
+            return SlashCommandOptionType.ROLE;
+        if (option.getStringValue().isPresent())
+            return SlashCommandOptionType.STRING;
+        if (option.requestUserValue().isPresent())
+            return SlashCommandOptionType.USER;
+
+        return SlashCommandOptionType.UNKNOWN;
+    }
+
+    @Override
+    public Object getComponentContextObject(Object context, Class<?> type) {
+        ButtonInteraction button = (ButtonInteraction) context;
+        switch (type.getName()) {
+            case "org.javacord.api.entity.message.Message":
+                return button.getMessage();
+            default:
+                return getInteractionContextObject(context, type);
+        }
+    }
+
+    @Override
+    public Object getInteractionContextObject(Object context, Class<?> type) {
+        ButtonInteraction button = (ButtonInteraction) context;
+        switch (type.getName()) {
+            case "org.javacord.api.entity.channel.TextChannel":
+                return button.getChannel().orElse(null);
+            case "org.javacord.api.entity.server.Server":
+                return button.getServer().orElse(null);
+            case "org.javacord.api.entity.user.User":
+                return button.getUser();
+        }
+        return null;
+    }
+
+    @Override
+    public Object getAutocompleteFocusedOption(Object context) {
+        AutocompleteInteraction interaction = (AutocompleteInteraction) context;
+        return getOptionValue(interaction.getFocusedOption());
+    }
+
+}

wrapper/javacord/src/main/java/net/tomatentum/marinara/wrapper/javacord/JavacordWrapper.java

@@ -8,12 +8,17 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.logging.log4j.Logger;
 import org.javacord.api.DiscordApi;
 import org.javacord.api.interaction.ApplicationCommandInteraction;
+import org.javacord.api.interaction.AutocompleteInteraction;
 import org.javacord.api.interaction.ButtonInteraction;
 import org.javacord.api.interaction.SlashCommandBuilder;
 import org.javacord.api.interaction.SlashCommandInteraction;
 import org.javacord.api.interaction.SlashCommandInteractionOption;
+import org.javacord.api.interaction.SlashCommandOptionBuilder;
+import org.javacord.api.interaction.SlashCommandOptionChoiceBuilder;
+import org.javacord.api.interaction.SlashCommandOptionType;
 
 import io.leangen.geantyref.AnnotationFormatException;
 import io.leangen.geantyref.TypeFactory;
@@ -22,27 +27,35 @@ import net.tomatentum.marinara.interaction.commands.ExecutableSlashCommandDefini
 import net.tomatentum.marinara.interaction.commands.SlashCommandDefinition;
 import net.tomatentum.marinara.interaction.commands.annotation.SlashCommand;
 import net.tomatentum.marinara.interaction.commands.annotation.SlashCommandOption;
+import net.tomatentum.marinara.interaction.commands.annotation.SlashCommandOptionChoice;
 import net.tomatentum.marinara.interaction.commands.annotation.SubCommand;
 import net.tomatentum.marinara.interaction.commands.annotation.SubCommandGroup;
-import net.tomatentum.marinara.interaction.commands.option.SlashCommandOptionType;
+import net.tomatentum.marinara.wrapper.ContextObjectProvider;
+import net.tomatentum.marinara.util.LoggerUtil;
 import net.tomatentum.marinara.wrapper.LibraryWrapper;
 
 public class JavacordWrapper extends LibraryWrapper {
 
     private DiscordApi api;
+    private JavacordContextObjectProvider contextObjectProvider;
+    
+    private Logger logger = LoggerUtil.getLogger(getClass());
 
     public JavacordWrapper(DiscordApi api) {
         this.api = api;
+        this.contextObjectProvider = new JavacordContextObjectProvider();
         api.addInteractionCreateListener((e) -> handleInteraction(e.getInteraction()));
+        logger.info("Javacord wrapper loaded!");
     }
 
     @Override
-    public InteractionType getInteractionType(Class<?> clazz) {
-        if (ApplicationCommandInteraction.class.isAssignableFrom(clazz))
+    public InteractionType getInteractionType(Object context) {
+        if (AutocompleteInteraction.class.isAssignableFrom(context.getClass()))
+            return InteractionType.AUTOCOMPLETE;
+        if (ApplicationCommandInteraction.class.isAssignableFrom(context.getClass()))
             return InteractionType.COMMAND;
-        if (ButtonInteraction.class.isAssignableFrom(clazz))
+        if (ButtonInteraction.class.isAssignableFrom(context.getClass()))
             return InteractionType.BUTTON;
-
         return null;
     }
 
@@ -67,22 +80,6 @@ public class JavacordWrapper extends LibraryWrapper {
         api.bulkOverwriteGlobalApplicationCommands(globalCommands);
     }
 
-    @Override
-    public Object convertCommandOption(Object context, SlashCommandOptionType type, String optionName) {
-        if (!(context instanceof SlashCommandInteraction))
-            return null;
-        SlashCommandInteraction interaction = (SlashCommandInteraction) context;
-        if (!interaction.getArguments().isEmpty())
-            return getOptionValue(interaction.getOptionByName(optionName).get(), type);
-
-        SlashCommandInteractionOption subCommandOption = interaction.getOptions().getFirst();
-
-        if (!subCommandOption.getOptions().isEmpty())
-            subCommandOption = subCommandOption.getOptions().getFirst();
-
-        return getOptionValue(subCommandOption.getOptionByName(optionName).get(), type);
-    }
-
     @Override
     public ExecutableSlashCommandDefinition getCommandDefinition(Object context) {
         if (!(context instanceof SlashCommandInteraction))
@@ -93,13 +90,15 @@ public class JavacordWrapper extends LibraryWrapper {
         List<SlashCommandInteractionOption> options = interaction.getOptions();
         try {
             builder.setApplicationCommand(TypeFactory.annotation(SlashCommand.class, Map.of("name", interaction.getCommandName())));
-            if (!options.getFirst().getArguments().isEmpty()) {
-                builder.setSubCommandGroup(TypeFactory.annotation(SubCommandGroup.class, Map.of("name", options.getFirst().getName())));
-                builder.setSubCommand(TypeFactory.annotation(SubCommand.class, Map.of("name", options.getFirst().getOptions().getFirst().getName())));
-            }else
-                builder.setSubCommand(TypeFactory.annotation(SubCommand.class, Map.of("name", options.getFirst().getName())));
+            if (!options.isEmpty()) {
+                if (!options.getFirst().getArguments().isEmpty()) {
+                    builder.setSubCommandGroup(TypeFactory.annotation(SubCommandGroup.class, Map.of("name", options.getFirst().getName())));
+                    builder.setSubCommand(TypeFactory.annotation(SubCommand.class, Map.of("name", options.getFirst().getOptions().getFirst().getName())));
+                }else
+                    builder.setSubCommand(TypeFactory.annotation(SubCommand.class, Map.of("name", options.getFirst().getName())));
+            }
         } catch (AnnotationFormatException e) {
-            e.printStackTrace();
+            logger.fatal(e);
         }
 
         return builder.build();
@@ -120,44 +119,53 @@ public class JavacordWrapper extends LibraryWrapper {
 
     private org.javacord.api.interaction.SlashCommandOption convertSubCommandGroupDef(SlashCommandDefinition def, SubCommandGroup subGroup) {
         SubCommand[] subCommands = def.getSubCommands(subGroup.name());
-        org.javacord.api.interaction.SlashCommandOption[] convertedSubCommands = (org.javacord.api.interaction.SlashCommandOption[]) Arrays.stream(subCommands).map(this::convertSubCommandDef).toArray();
-        return org.javacord.api.interaction.SlashCommandOption.createWithOptions(org.javacord.api.interaction.SlashCommandOptionType.SUB_COMMAND_GROUP, subGroup.name(), subGroup.description(), Arrays.asList(convertedSubCommands));
+        List<org.javacord.api.interaction.SlashCommandOption> convertedSubCommands = Arrays.stream(subCommands).map(this::convertSubCommandDef).toList();
+        return org.javacord.api.interaction.SlashCommandOption.createWithOptions(
+            org.javacord.api.interaction.SlashCommandOptionType.SUB_COMMAND_GROUP, 
+            subGroup.name(), 
+            subGroup.description(), 
+            convertedSubCommands);
     }
 
     private org.javacord.api.interaction.SlashCommandOption convertSubCommandDef(SubCommand sub) {
-        List<org.javacord.api.interaction.SlashCommandOption> convertedOptions = new ArrayList<>();
-        Arrays.stream(sub.options()).map(this::convertOptionDef).forEach(convertedOptions::add);
-        return org.javacord.api.interaction.SlashCommandOption.createWithOptions(org.javacord.api.interaction.SlashCommandOptionType.SUB_COMMAND, sub.name(), sub.description(), convertedOptions);
+        List<org.javacord.api.interaction.SlashCommandOption> convertedOptions = Arrays.stream(sub.options()).map(this::convertOptionDef).toList();
+        return org.javacord.api.interaction.SlashCommandOption.createWithOptions(
+            org.javacord.api.interaction.SlashCommandOptionType.SUB_COMMAND, 
+            sub.name(), 
+            sub.description(), 
+            convertedOptions);
     }
 
     private org.javacord.api.interaction.SlashCommandOption convertOptionDef(SlashCommandOption option) {
-        org.javacord.api.interaction.SlashCommandOptionType type = Enum.valueOf(org.javacord.api.interaction.SlashCommandOptionType.class, option.type().toString());
-        return org.javacord.api.interaction.SlashCommandOption.create(type, option.name(), option.description(), option.required());
+        SlashCommandOptionType type = SlashCommandOptionType.fromValue(option.type().getValue());
+        SlashCommandOptionBuilder builder = new SlashCommandOptionBuilder();
+        builder
+            .setType(type)
+            .setName(option.name())
+            .setDescription(option.description())
+            .setRequired(option.required())
+            .setAutocompletable(option.autocomplete())
+            .setChoices(convertChoices(option));
+        
+        return builder.build();
     }
 
-    private Object getOptionValue(SlashCommandInteractionOption option, SlashCommandOptionType type) {
-        switch (type) {
-            case ATTACHMENT:
-                return option.getAttachmentValue().get();
-            case BOOLEAN:
-                return option.getBooleanValue().get();
-            case CHANNEL:
-                return option.getChannelValue().get();
-            case DECIMAL:
-                return option.getDecimalValue().get();
-            case LONG:
-                return option.getLongValue().get();
-            case MENTIONABLE:
-                return option.getMentionableValue().get();
-            case ROLE:
-                return option.getRoleValue().get();
-            case STRING:
-                return option.getStringValue().get();
-            case USER:
-                return option.getUserValue().get();
-            default:
-                return null;
+    private List<org.javacord.api.interaction.SlashCommandOptionChoice> convertChoices(SlashCommandOption option) {
+        List<org.javacord.api.interaction.SlashCommandOptionChoice> convertedChoices = new ArrayList<>();
+        for (SlashCommandOptionChoice choice : ExecutableSlashCommandDefinition.getActualChoices(option)) {
+            SlashCommandOptionChoiceBuilder builder = new SlashCommandOptionChoiceBuilder();
+            builder.setName(choice.name());
+            if (choice.longValue() != Long.MAX_VALUE)
+                builder.setValue(choice.longValue());
+            /*
+            not yet available
+            if (choice.doubleValue() != Double.MAX_VALUE)
+                builder.setValue(choice.doubleValue());
+            */
+            if (!choice.stringValue().isEmpty())
+                builder.setValue(choice.stringValue());
         }
+        return convertedChoices;
     }
 
     @Override
@@ -167,20 +175,8 @@ public class JavacordWrapper extends LibraryWrapper {
     }
 
     @Override
-    public Object getComponentContextObject(Object context, Class<?> type) {
-        ButtonInteraction button = (ButtonInteraction) context;
-        switch (type.getName()) {
-            case "org.javacord.api.entity.channel.TextChannel":
-                return button.getChannel().orElse(null);
-            case "org.javacord.api.entity.message.Message":
-                return button.getMessage();
-            case "org.javacord.api.entity.server.Server":
-                return button.getServer().orElse(null);
-            case "org.javacord.api.entity.user.User":
-                return button.getUser();
-        }
-        return null;
+    public ContextObjectProvider getContextObjectProvider() {
+        return contextObjectProvider;
     }
 
-    
 }

wrapper/javacord/src/main/java/net/tomatentum/marinara/wrapper/javacord/checks/PermissionCheck.java

@@ -0,0 +1,41 @@
+package net.tomatentum.marinara.wrapper.javacord.checks;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.Optional;
+
+import org.javacord.api.entity.permission.PermissionType;
+import org.javacord.api.entity.server.Server;
+import org.javacord.api.interaction.InteractionBase;
+
+import net.tomatentum.marinara.checks.InteractionCheck;
+
+public class PermissionCheck implements InteractionCheck<PermissionCheck.HasPermission> {
+
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.METHOD)
+    public static @interface HasPermission {
+        public PermissionType[] value();
+    }
+
+    @Override
+    public boolean preExec(Object context, HasPermission annotation) {
+        throw new UnsupportedOperationException("Unimplemented method 'preExec'");
+    }
+
+    public boolean preExec(InteractionBase context, HasPermission annotation) {
+        Optional<Server> server = context.getServer();
+        if (!server.isPresent())
+            return false;
+
+       return server.get().hasPermissions(context.getUser(), annotation.value());
+    }
+
+    @Override
+    public void postExec(Object context, HasPermission annotation) {
+        
+    }
+    
+}

wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/AutoCompleteTest.java

@@ -0,0 +1,23 @@
+package net.tomatentum.marinara.test.javacord;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import net.tomatentum.marinara.Marinara;
+import net.tomatentum.marinara.test.javacord.mocks.AutocompleteInteractionMock;
+import net.tomatentum.marinara.test.javacord.mocks.DiscordApiMock;
+import net.tomatentum.marinara.wrapper.LibraryWrapper;
+import net.tomatentum.marinara.wrapper.javacord.JavacordWrapper;
+
+public class AutoCompleteTest {
+    
+    @Test
+    public void testAutocomplete() {
+        LibraryWrapper wrapper = new JavacordWrapper(new DiscordApiMock()); //null okay as we don't use the discord API in this test.
+        Marinara marinara = Marinara.load(wrapper);
+        marinara.getRegistry().addInteractions(new TestAutocomplete());
+        wrapper.handleInteraction(new AutocompleteInteractionMock());
+        assertTrue(AutocompleteInteractionMock.didAutocompleteRun);
+    }
+}

wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/ButtonTest.java

@@ -1,4 +1,4 @@
-package net.tomatentum.marinara.test;
+package net.tomatentum.marinara.test.javacord;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -7,8 +7,8 @@ import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.TestInstance.Lifecycle;
 
 import net.tomatentum.marinara.Marinara;
-import net.tomatentum.marinara.test.mocks.ButtonInteractionMock;
-import net.tomatentum.marinara.test.mocks.DiscordApiMock;
+import net.tomatentum.marinara.test.javacord.mocks.ButtonInteractionMock;
+import net.tomatentum.marinara.test.javacord.mocks.DiscordApiMock;
 import net.tomatentum.marinara.wrapper.LibraryWrapper;
 import net.tomatentum.marinara.wrapper.javacord.JavacordWrapper;
 
@@ -20,7 +20,7 @@ public class ButtonTest {
         LibraryWrapper wrapper = new JavacordWrapper(new DiscordApiMock()); //null okay as we don't use the discord API in this test.
         Marinara marinara = Marinara.load(wrapper);
         marinara.getRegistry().addInteractions(new TestButton());
-        wrapper.handleInteraction(new ButtonInteractionMock());
+        wrapper.handleInteraction(new ButtonInteractionMock("test"));
         assertTrue(TestButton.didRun);
     }
     

wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/InteractionCheckTest.java

@@ -0,0 +1,47 @@
+package net.tomatentum.marinara.test.javacord;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.javacord.api.entity.permission.PermissionType;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestInstance.Lifecycle;
+
+import net.tomatentum.marinara.Marinara;
+import net.tomatentum.marinara.test.javacord.mocks.ButtonInteractionMock;
+import net.tomatentum.marinara.test.javacord.mocks.DiscordApiMock;
+import net.tomatentum.marinara.test.javacord.mocks.ServerMock;
+import net.tomatentum.marinara.wrapper.LibraryWrapper;
+import net.tomatentum.marinara.wrapper.javacord.JavacordWrapper;
+import net.tomatentum.marinara.wrapper.javacord.checks.PermissionCheck;
+
+@TestInstance(Lifecycle.PER_CLASS)
+public class InteractionCheckTest {
+    
+    @Test
+    public void testInteractionCheck() {
+        LibraryWrapper wrapper = new JavacordWrapper(new DiscordApiMock());
+        Marinara marinara = Marinara.load(wrapper);
+        marinara.getCheckRegistry().addCheck(new TestInteractionCheck());
+        marinara.getRegistry().addInteractions(new TestButton());
+        wrapper.handleInteraction(new ButtonInteractionMock("test"));
+        assertTrue(TestInteractionCheck.preExecuted);
+        assertTrue(TestInteractionCheck.postExecuted);
+    }
+
+    @Test
+    public void testPermissionCheck() {
+        LibraryWrapper wrapper = new JavacordWrapper(new DiscordApiMock());
+        Marinara marinara = Marinara.load(wrapper);
+        marinara.getCheckRegistry().addCheck(new PermissionCheck());
+        marinara.getRegistry().addInteractions(new TestButton());
+        wrapper.handleInteraction(new ButtonInteractionMock("permissionCheck"));
+        assertTrue(TestButton.didPermRun);
+        TestButton.didPermRun = false;
+        ServerMock.TESTPERMISSION = PermissionType.ATTACH_FILE;
+        wrapper.handleInteraction(new ButtonInteractionMock("permissionCheck"));
+        assertFalse(TestButton.didPermRun);
+    }
+
+}

wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/SlashCommandTest.java

@@ -1,4 +1,4 @@
-package net.tomatentum.marinara.test;
+package net.tomatentum.marinara.test.javacord;
 
 import org.javacord.api.DiscordApi;
 import org.javacord.api.DiscordApiBuilder;
@@ -9,7 +9,7 @@ import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.TestInstance.Lifecycle;
 
 import net.tomatentum.marinara.Marinara;
-import net.tomatentum.marinara.test.mocks.SlashCommandInteractionMock;
+import net.tomatentum.marinara.test.javacord.mocks.SlashCommandInteractionMock;
 import net.tomatentum.marinara.wrapper.LibraryWrapper;
 import net.tomatentum.marinara.wrapper.javacord.JavacordWrapper;
 @TestInstance(Lifecycle.PER_CLASS)

wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/TestAutocomplete.java

@@ -0,0 +1,23 @@
+package net.tomatentum.marinara.test.javacord;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Collections;
+
+import org.javacord.api.interaction.AutocompleteInteraction;
+
+import net.tomatentum.marinara.interaction.InteractionHandler;
+import net.tomatentum.marinara.interaction.annotation.AutoComplete;
+import net.tomatentum.marinara.interaction.commands.annotation.SlashCommand;
+
+public class TestAutocomplete implements InteractionHandler {
+    
+    @SlashCommand(name = "test")
+    @AutoComplete
+    public void autocomplete(AutocompleteInteraction context, String value) {
+        System.out.println("Success!");
+        assertEquals(value, "test");
+        context.respondWithChoices(Collections.emptyList());
+    }
+
+}

wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/TestButton.java

@@ -1,21 +1,25 @@
-package net.tomatentum.marinara.test;
+package net.tomatentum.marinara.test.javacord;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import org.javacord.api.entity.channel.TextChannel;
 import org.javacord.api.entity.message.Message;
+import org.javacord.api.entity.permission.PermissionType;
 import org.javacord.api.entity.server.Server;
 import org.javacord.api.entity.user.User;
 import org.javacord.api.interaction.ButtonInteraction;
 
 import net.tomatentum.marinara.interaction.InteractionHandler;
 import net.tomatentum.marinara.interaction.annotation.Button;
+import net.tomatentum.marinara.test.javacord.TestInteractionCheck.TestCheck;
+import net.tomatentum.marinara.wrapper.javacord.checks.PermissionCheck.HasPermission;
 
 public class TestButton implements InteractionHandler {
 
 
     public static boolean didRun = false;
     @Button("test")
+    @TestCheck
     public void exec(ButtonInteraction interaction, TextChannel channel, Message message, User member, Server server) {
         assertNotNull(interaction);
         assertNotNull(channel);
@@ -25,5 +29,14 @@ public class TestButton implements InteractionHandler {
         didRun = true;
         System.out.println("Success!");
     }
+
+    public static boolean didPermRun = false;
+
+    @Button("permissionCheck")
+    @HasPermission({PermissionType.ADMINISTRATOR})
+    public void exec(ButtonInteraction interaction) {
+        didPermRun = true;
+        System.out.println("It worked!");
+    }
     
 }

wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/TestChoiceEnum.java

@@ -0,0 +1,20 @@
+package net.tomatentum.marinara.test.javacord;
+
+import net.tomatentum.marinara.interaction.commands.ChoiceValueProvider;
+
+public enum TestChoiceEnum implements ChoiceValueProvider<String> {
+    TestValue("testValue"),
+    FooBar("fooBar"),
+    Spongebob("spongebob");
+
+    private String value;
+
+    private TestChoiceEnum(String value) {
+        this.value = value;
+    }
+    @Override
+    public String getChoiceValue() {
+        return value;
+    }
+    
+}

wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/TestCommand.java

@@ -1,4 +1,4 @@
-package net.tomatentum.marinara.test;
+package net.tomatentum.marinara.test.javacord;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -20,7 +20,8 @@ public class TestCommand implements InteractionHandler {
             @SlashCommandOption(
                 name = "foo",
                 description = "foo bar is very fooby",
-                type = SlashCommandOptionType.STRING
+                type = SlashCommandOptionType.STRING,
+                choiceEnum = TestChoiceEnum.class
             )
         }
         )

wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/TestInteractionCheck.java

@@ -0,0 +1,37 @@
+package net.tomatentum.marinara.test.javacord;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import net.tomatentum.marinara.checks.InteractionCheck;
+
+public class TestInteractionCheck implements InteractionCheck<TestInteractionCheck.TestCheck> {
+
+    public static boolean preExecuted = false;
+    public static boolean postExecuted = false;
+
+    @Target({ElementType.METHOD})
+    @Retention(RetentionPolicy.RUNTIME)
+    public static @interface TestCheck {
+    }
+
+    @Override
+    public boolean preExec(Object context, TestCheck annotation) {
+        assertNotNull(annotation);
+        assertNotNull(context);
+        preExecuted = true;
+        return true;
+    }
+
+    @Override
+    public void postExec(Object context, TestCheck annotation) {
+        assertNotNull(annotation);
+        assertNotNull(context);
+        postExecuted = true;
+    }
+    
+}

wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/AutocompleteInteractionMock.java

@@ -0,0 +1,179 @@
+package net.tomatentum.marinara.test.javacord.mocks;
+
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+import org.javacord.api.DiscordApi;
+import org.javacord.api.entity.channel.TextChannel;
+import org.javacord.api.entity.message.component.HighLevelComponent;
+import org.javacord.api.entity.permission.PermissionType;
+import org.javacord.api.entity.server.Server;
+import org.javacord.api.entity.user.User;
+import org.javacord.api.interaction.AutocompleteInteraction;
+import org.javacord.api.interaction.DiscordLocale;
+import org.javacord.api.interaction.InteractionType;
+import org.javacord.api.interaction.SlashCommandInteractionOption;
+import org.javacord.api.interaction.SlashCommandOptionChoice;
+import org.javacord.api.interaction.callback.InteractionFollowupMessageBuilder;
+import org.javacord.api.interaction.callback.InteractionImmediateResponseBuilder;
+import org.javacord.api.interaction.callback.InteractionOriginalResponseUpdater;
+
+public class AutocompleteInteractionMock implements AutocompleteInteraction {
+
+    public static boolean didAutocompleteRun = false;
+
+    @Override
+    public String getFullCommandName() {
+        return "test";
+    }
+
+    @Override
+    public long getCommandId() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getCommandId'");
+    }
+
+    @Override
+    public String getCommandIdAsString() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getCommandIdAsString'");
+    }
+
+    @Override
+    public String getCommandName() {
+        return "test";
+    }
+
+    @Override
+    public Optional<Long> getRegisteredCommandServerId() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getRegisteredCommandServerId'");
+    }
+
+    @Override
+    public long getApplicationId() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getApplicationId'");
+    }
+
+    @Override
+    public InteractionType getType() {
+        return InteractionType.APPLICATION_COMMAND_AUTOCOMPLETE;
+    }
+
+    @Override
+    public InteractionImmediateResponseBuilder createImmediateResponder() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'createImmediateResponder'");
+    }
+
+    @Override
+    public CompletableFuture<InteractionOriginalResponseUpdater> respondLater() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'respondLater'");
+    }
+
+    @Override
+    public CompletableFuture<InteractionOriginalResponseUpdater> respondLater(boolean ephemeral) {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'respondLater'");
+    }
+
+    @Override
+    public CompletableFuture<Void> respondWithModal(String customId, String title,
+            List<HighLevelComponent> components) {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'respondWithModal'");
+    }
+
+    @Override
+    public InteractionFollowupMessageBuilder createFollowupMessageBuilder() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'createFollowupMessageBuilder'");
+    }
+
+    @Override
+    public Optional<Server> getServer() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getServer'");
+    }
+
+    @Override
+    public Optional<TextChannel> getChannel() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getChannel'");
+    }
+
+    @Override
+    public User getUser() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getUser'");
+    }
+
+    @Override
+    public String getToken() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getToken'");
+    }
+
+    @Override
+    public int getVersion() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getVersion'");
+    }
+
+    @Override
+    public DiscordLocale getLocale() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getLocale'");
+    }
+
+    @Override
+    public Optional<DiscordLocale> getServerLocale() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getServerLocale'");
+    }
+
+    @Override
+    public Optional<EnumSet<PermissionType>> getBotPermissions() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getBotPermissions'");
+    }
+
+    @Override
+    public DiscordApi getApi() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getApi'");
+    }
+
+    @Override
+    public long getId() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getId'");
+    }
+
+    @Override
+    public List<SlashCommandInteractionOption> getOptions() {
+        return new ArrayList<>();
+    }
+
+    @Override
+    public List<SlashCommandInteractionOption> getArguments() {
+        return new ArrayList<>();
+    }
+
+    @Override
+    public CompletableFuture<Void> respondWithChoices(List<SlashCommandOptionChoice> choices) {
+        didAutocompleteRun = true;
+        return CompletableFuture.completedFuture(null);
+    }
+
+    @Override
+    public SlashCommandInteractionOption getFocusedOption() {
+        return new SlashCommandInteractionOptionMock();
+    }
+    
+}

wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/ButtonInteractionMock.java

@@ -1,4 +1,4 @@
-package net.tomatentum.marinara.test.mocks;
+package net.tomatentum.marinara.test.javacord.mocks;
 
 import java.util.EnumSet;
 import java.util.List;
@@ -23,6 +23,12 @@ import org.javacord.api.interaction.callback.InteractionOriginalResponseUpdater;
 
 public class ButtonInteractionMock implements ButtonInteraction {
 
+    private String customId;
+    
+    public ButtonInteractionMock(String customId) {
+        this.customId = customId;
+    }
+
     @Override
     public Message getMessage() {
         return new MessageMock();
@@ -30,7 +36,7 @@ public class ButtonInteractionMock implements ButtonInteraction {
 
     @Override
     public String getCustomId() {
-        return "test";
+        return this.customId;
     }
 
     @Override

wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/ChannelMock.java

@@ -1,4 +1,4 @@
-package net.tomatentum.marinara.test.mocks;
+package net.tomatentum.marinara.test.javacord.mocks;
 
 import java.util.Collection;
 import java.util.List;

wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/DiscordApiMock.java

@@ -1,4 +1,4 @@
-package net.tomatentum.marinara.test.mocks;
+package net.tomatentum.marinara.test.javacord.mocks;
 
 import java.time.Duration;
 import java.util.Collection;

wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/MessageMock.java

@@ -1,4 +1,4 @@
-package net.tomatentum.marinara.test.mocks;
+package net.tomatentum.marinara.test.javacord.mocks;
 
 import java.time.Instant;
 import java.util.Collection;

wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/ServerMock.java

@@ -1,4 +1,6 @@
-package net.tomatentum.marinara.test.mocks;
+package net.tomatentum.marinara.test.javacord.mocks;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.time.Instant;
 import java.util.Collection;
@@ -27,6 +29,7 @@ import org.javacord.api.entity.channel.ServerTextChannel;
 import org.javacord.api.entity.channel.ServerThreadChannel;
 import org.javacord.api.entity.channel.ServerVoiceChannel;
 import org.javacord.api.entity.emoji.KnownCustomEmoji;
+import org.javacord.api.entity.permission.PermissionType;
 import org.javacord.api.entity.permission.Role;
 import org.javacord.api.entity.server.ActiveThreads;
 import org.javacord.api.entity.server.Ban;
@@ -2259,5 +2262,12 @@ public class ServerMock implements Server {
         // TODO Auto-generated method stub
         throw new UnsupportedOperationException("Unimplemented method 'getSystemChannelFlags'");
     }
+    public static PermissionType TESTPERMISSION = PermissionType.ADMINISTRATOR;
+    @Override
+    public boolean hasPermissions(User user, PermissionType... type) {
+        assertNotNull(user);
+        assertNotNull(type);
+        return TESTPERMISSION.equals(type[0]);
+    }
     
 }

wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/SlashCommandInteractionMock.java

@@ -1,4 +1,4 @@
-package net.tomatentum.marinara.test.mocks;
+package net.tomatentum.marinara.test.javacord.mocks;
 
 import java.util.Arrays;
 import java.util.EnumSet;

wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/SlashCommandInteractionOptionMock.java

@@ -1,4 +1,4 @@
-package net.tomatentum.marinara.test.mocks;
+package net.tomatentum.marinara.test.javacord.mocks;
 
 import java.util.Collections;
 import java.util.List;
@@ -41,52 +41,52 @@ public class SlashCommandInteractionOptionMock implements SlashCommandInteractio
 
     @Override
     public Optional<Long> getLongValue() {
-        throw new UnsupportedOperationException("Unimplemented method 'getLongValue'");
+        return Optional.empty();
     }
 
     @Override
     public Optional<Boolean> getBooleanValue() {
-        throw new UnsupportedOperationException("Unimplemented method 'getBooleanValue'");
+        return Optional.empty();
     }
 
     @Override
     public Optional<User> getUserValue() {
-        throw new UnsupportedOperationException("Unimplemented method 'getUserValue'");
+        return Optional.empty();
     }
 
     @Override
     public Optional<CompletableFuture<User>> requestUserValue() {
-        throw new UnsupportedOperationException("Unimplemented method 'requestUserValue'");
+        return Optional.empty();
     }
 
     @Override
     public Optional<ServerChannel> getChannelValue() {
-        throw new UnsupportedOperationException("Unimplemented method 'getChannelValue'");
+        return Optional.empty();
     }
 
     @Override
     public Optional<Attachment> getAttachmentValue() {
-        throw new UnsupportedOperationException("Unimplemented method 'getAttachmentValue'");
+        return Optional.empty();
     }
 
     @Override
     public Optional<Role> getRoleValue() {
-        throw new UnsupportedOperationException("Unimplemented method 'getRoleValue'");
+        return Optional.empty();
     }
 
     @Override
     public Optional<Mentionable> getMentionableValue() {
-        throw new UnsupportedOperationException("Unimplemented method 'getMentionableValue'");
+        return Optional.empty();
     }
 
     @Override
     public Optional<Double> getDecimalValue() {
-        throw new UnsupportedOperationException("Unimplemented method 'getDecimalValue'");
+        return Optional.empty();
     }
 
     @Override
     public Optional<CompletableFuture<Mentionable>> requestMentionableValue() {
-        throw new UnsupportedOperationException("Unimplemented method 'requestMentionableValue'");
+        return Optional.empty();
     }
 
     @Override

wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/mocks/UserMock.java

@@ -1,4 +1,4 @@
-package net.tomatentum.marinara.test.mocks;
+package net.tomatentum.marinara.test.javacord.mocks;
 
 import java.awt.Color;
 import java.time.Instant;