From 236c584da8be1163a1a8732bb9ec9ae7931a1072 Mon Sep 17 00:00:00 2001
From: tueem <tueem@tomatentum.net>
Date: Thu, 20 Feb 2025 09:10:28 +0100
Subject: [PATCH] move Choice classes

---
 .../interaction/commands/ExecutableSlashCommandDefinition.java  | 1 +
 .../interaction/commands/{ => choice}/ChoiceValueProvider.java  | 2 +-
 .../marinara/interaction/commands/{ => choice}/EnumChoices.java | 2 +-
 .../net/tomatentum/marinara/test/discord4j/TestChoiceEnum.java  | 2 +-
 .../net/tomatentum/marinara/test/javacord/TestChoiceEnum.java   | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)
 rename lib/src/main/java/net/tomatentum/marinara/interaction/commands/{ => choice}/ChoiceValueProvider.java (53%)
 rename lib/src/main/java/net/tomatentum/marinara/interaction/commands/{ => choice}/EnumChoices.java (98%)

diff --git a/lib/src/main/java/net/tomatentum/marinara/interaction/commands/ExecutableSlashCommandDefinition.java b/lib/src/main/java/net/tomatentum/marinara/interaction/commands/ExecutableSlashCommandDefinition.java
index 76bc8eb..480d363 100644
--- a/lib/src/main/java/net/tomatentum/marinara/interaction/commands/ExecutableSlashCommandDefinition.java
+++ b/lib/src/main/java/net/tomatentum/marinara/interaction/commands/ExecutableSlashCommandDefinition.java
@@ -6,6 +6,7 @@ import net.tomatentum.marinara.interaction.commands.annotation.SlashCommandOptio
 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;
+import net.tomatentum.marinara.interaction.commands.choice.EnumChoices;
 
 public record ExecutableSlashCommandDefinition(
     SlashCommand applicationCommand,
diff --git a/lib/src/main/java/net/tomatentum/marinara/interaction/commands/ChoiceValueProvider.java b/lib/src/main/java/net/tomatentum/marinara/interaction/commands/choice/ChoiceValueProvider.java
similarity index 53%
rename from lib/src/main/java/net/tomatentum/marinara/interaction/commands/ChoiceValueProvider.java
rename to lib/src/main/java/net/tomatentum/marinara/interaction/commands/choice/ChoiceValueProvider.java
index b7d13f6..b025047 100644
--- a/lib/src/main/java/net/tomatentum/marinara/interaction/commands/ChoiceValueProvider.java
+++ b/lib/src/main/java/net/tomatentum/marinara/interaction/commands/choice/ChoiceValueProvider.java
@@ -1,4 +1,4 @@
-package net.tomatentum.marinara.interaction.commands;
+package net.tomatentum.marinara.interaction.commands.choice;
 
 public interface ChoiceValueProvider<T> {
     T getChoiceValue();
diff --git a/lib/src/main/java/net/tomatentum/marinara/interaction/commands/EnumChoices.java b/lib/src/main/java/net/tomatentum/marinara/interaction/commands/choice/EnumChoices.java
similarity index 98%
rename from lib/src/main/java/net/tomatentum/marinara/interaction/commands/EnumChoices.java
rename to lib/src/main/java/net/tomatentum/marinara/interaction/commands/choice/EnumChoices.java
index 1001db3..f012c1f 100644
--- a/lib/src/main/java/net/tomatentum/marinara/interaction/commands/EnumChoices.java
+++ b/lib/src/main/java/net/tomatentum/marinara/interaction/commands/choice/EnumChoices.java
@@ -1,4 +1,4 @@
-package net.tomatentum.marinara.interaction.commands;
+package net.tomatentum.marinara.interaction.commands.choice;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
diff --git a/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/TestChoiceEnum.java b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/TestChoiceEnum.java
index 66ab699..015510c 100644
--- a/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/TestChoiceEnum.java
+++ b/wrapper/discord4j/src/test/java/net/tomatentum/marinara/test/discord4j/TestChoiceEnum.java
@@ -1,6 +1,6 @@
 package net.tomatentum.marinara.test.discord4j;
 
-import net.tomatentum.marinara.interaction.commands.ChoiceValueProvider;
+import net.tomatentum.marinara.interaction.commands.choice.ChoiceValueProvider;
 
 public enum TestChoiceEnum implements ChoiceValueProvider<String> {
     TestValue("testValue"),
diff --git a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/TestChoiceEnum.java b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/TestChoiceEnum.java
index 1423ef9..955bab9 100644
--- a/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/TestChoiceEnum.java
+++ b/wrapper/javacord/src/test/java/net/tomatentum/marinara/test/javacord/TestChoiceEnum.java
@@ -1,6 +1,6 @@
 package net.tomatentum.marinara.test.javacord;
 
-import net.tomatentum.marinara.interaction.commands.ChoiceValueProvider;
+import net.tomatentum.marinara.interaction.commands.choice.ChoiceValueProvider;
 
 public enum TestChoiceEnum implements ChoiceValueProvider<String> {
     TestValue("testValue"),