diff --git a/wrapper/discord4j/src/main/java/net/tomatentum/marinara/wrapper/discord4j/Discord4JWrapper.java b/wrapper/discord4j/src/main/java/net/tomatentum/marinara/wrapper/discord4j/Discord4JWrapper.java index 66df289..d276aaf 100644 --- a/wrapper/discord4j/src/main/java/net/tomatentum/marinara/wrapper/discord4j/Discord4JWrapper.java +++ b/wrapper/discord4j/src/main/java/net/tomatentum/marinara/wrapper/discord4j/Discord4JWrapper.java @@ -81,8 +81,8 @@ public class Discord4JWrapper extends LibraryWrapper { for (SlashCommandDefinition slashCommandDefinition : defs) { ApplicationCommandRequest request = convertSlashCommand(slashCommandDefinition); - if (slashCommandDefinition.getFullSlashCommand().serverIds().length > 0) { - for (long serverId : slashCommandDefinition.getFullSlashCommand().serverIds()) { + if (slashCommandDefinition.getSlashCommand().serverIds().length > 0) { + for (long serverId : slashCommandDefinition.getSlashCommand().serverIds()) { serverCommands.putIfAbsent(serverId, new ArrayList<>()); serverCommands.get(serverId).add(request); } @@ -132,7 +132,7 @@ public class Discord4JWrapper extends LibraryWrapper { private ApplicationCommandRequest convertSlashCommand(SlashCommandDefinition def) { List options = new ArrayList<>(); - SlashCommand cmd = def.getFullSlashCommand(); + SlashCommand cmd = def.getSlashCommand(); 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); @@ -191,6 +191,7 @@ public class Discord4JWrapper extends LibraryWrapper { builder.value(choice.doubleValue()); if (!choice.stringValue().isEmpty()) builder.value(choice.stringValue()); + convertedChoices.add(builder.build()); } return convertedChoices; } 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 e8555bb..6659ca2 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 @@ -65,8 +65,8 @@ public class JavacordWrapper extends LibraryWrapper { Set globalCommands = new HashSet<>(); for (SlashCommandDefinition slashCommandDefinition : defs) { SlashCommandBuilder builder = convertSlashCommand(slashCommandDefinition); - if (slashCommandDefinition.getFullSlashCommand().serverIds().length > 0) { - for (long serverId : slashCommandDefinition.getFullSlashCommand().serverIds()) { + if (slashCommandDefinition.getSlashCommand().serverIds().length > 0) { + for (long serverId : slashCommandDefinition.getSlashCommand().serverIds()) { serverCommands.putIfAbsent(serverId, new HashSet<>()); serverCommands.get(serverId).add(builder); } @@ -106,7 +106,7 @@ public class JavacordWrapper extends LibraryWrapper { private SlashCommandBuilder convertSlashCommand(SlashCommandDefinition def) { List options = new ArrayList<>(); - SlashCommand cmd = def.getFullSlashCommand(); + SlashCommand cmd = def.getSlashCommand(); 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); @@ -164,6 +164,7 @@ public class JavacordWrapper extends LibraryWrapper { */ if (!choice.stringValue().isEmpty()) builder.setValue(choice.stringValue()); + convertedChoices.add(builder.build()); } return convertedChoices; }