diff --git a/lib/src/main/java/net/tomatentum/marinara/registry/InteractionRegistry.java b/lib/src/main/java/net/tomatentum/marinara/registry/InteractionRegistry.java index c771761..27a2152 100644 --- a/lib/src/main/java/net/tomatentum/marinara/registry/InteractionRegistry.java +++ b/lib/src/main/java/net/tomatentum/marinara/registry/InteractionRegistry.java @@ -66,7 +66,7 @@ public class InteractionRegistry { } public void handle(Object context) { - InteractionType type = marinara.getWrapper().getInteractionType(context.getClass()); + InteractionType type = marinara.getWrapper().getInteractionType(context); logger.debug("Received {} interaction ", context); interactionMethods.forEach((m) -> { if (m.getType().equals(type) && m.canRun(context)) { diff --git a/lib/src/main/java/net/tomatentum/marinara/wrapper/LibraryWrapper.java b/lib/src/main/java/net/tomatentum/marinara/wrapper/LibraryWrapper.java index 4fe8ef9..81da4eb 100644 --- a/lib/src/main/java/net/tomatentum/marinara/wrapper/LibraryWrapper.java +++ b/lib/src/main/java/net/tomatentum/marinara/wrapper/LibraryWrapper.java @@ -29,7 +29,7 @@ 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); diff --git a/wrapper/javacord/src/main/java/net/tomatentum/marinara/wrapper/javacord/JavacordWrapper.java b/wrapper/javacord/src/main/java/net/tomatentum/marinara/wrapper/javacord/JavacordWrapper.java index 7059094..3ba8adf 100644 --- a/wrapper/javacord/src/main/java/net/tomatentum/marinara/wrapper/javacord/JavacordWrapper.java +++ b/wrapper/javacord/src/main/java/net/tomatentum/marinara/wrapper/javacord/JavacordWrapper.java @@ -42,10 +42,10 @@ public class JavacordWrapper extends LibraryWrapper { } @Override - public InteractionType getInteractionType(Class clazz) { - if (ApplicationCommandInteraction.class.isAssignableFrom(clazz)) + public InteractionType getInteractionType(Object context) { + 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;