diff --git a/src/main/java/com/softawii/Main.java b/src/main/java/com/softawii/Main.java index 1a2e312..718a4c3 100644 --- a/src/main/java/com/softawii/Main.java +++ b/src/main/java/com/softawii/Main.java @@ -1,7 +1,7 @@ package com.softawii; -import com.softawii.curupira.example.controller.*; -import com.softawii.curupira.example.exceptions.GenericExceptionHandler; +import com.softawii.example.controller.*; +import com.softawii.example.exceptions.GenericExceptionHandler; import com.softawii.curupira.v2.core.CurupiraBoot; import com.softawii.curupira.v2.integration.BasicContextProvider; import net.dv8tion.jda.api.JDA; @@ -17,7 +17,7 @@ public static void main(String[] args) throws InterruptedException, NoSuchMethod BasicContextProvider context = new BasicContextProvider(); String token = System.getenv("discord_token"); - String pkg = "com.softawii.curupira.example"; + String pkg = "com.softawii.example"; context.registerInstance(GenericExceptionHandler.class, new GenericExceptionHandler()); context.registerInstance(BasicController.class, new BasicController()); diff --git a/src/main/java/com/softawii/curupira/example/controller/AutoMenuController.java b/src/main/java/com/softawii/example/controller/AutoMenuController.java similarity index 98% rename from src/main/java/com/softawii/curupira/example/controller/AutoMenuController.java rename to src/main/java/com/softawii/example/controller/AutoMenuController.java index 91331f7..cd0b449 100644 --- a/src/main/java/com/softawii/curupira/example/controller/AutoMenuController.java +++ b/src/main/java/com/softawii/example/controller/AutoMenuController.java @@ -1,4 +1,4 @@ -package com.softawii.curupira.example.controller; +package com.softawii.example.controller; import com.softawii.curupira.v2.annotations.DiscordController; import com.softawii.curupira.v2.annotations.commands.DiscordAutoComplete; diff --git a/src/main/java/com/softawii/curupira/example/controller/BasicController.java b/src/main/java/com/softawii/example/controller/BasicController.java similarity index 96% rename from src/main/java/com/softawii/curupira/example/controller/BasicController.java rename to src/main/java/com/softawii/example/controller/BasicController.java index aaf1fa0..0783519 100644 --- a/src/main/java/com/softawii/curupira/example/controller/BasicController.java +++ b/src/main/java/com/softawii/example/controller/BasicController.java @@ -1,4 +1,4 @@ -package com.softawii.curupira.example.controller; +package com.softawii.example.controller; import com.softawii.curupira.v2.annotations.DiscordController; import com.softawii.curupira.v2.annotations.RequestInfo; @@ -6,7 +6,6 @@ import com.softawii.curupira.v2.annotations.commands.DiscordParameter; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.JDA; -import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.MessageEmbed; diff --git a/src/main/java/com/softawii/curupira/example/controller/ComplexController.java b/src/main/java/com/softawii/example/controller/ComplexController.java similarity index 98% rename from src/main/java/com/softawii/curupira/example/controller/ComplexController.java rename to src/main/java/com/softawii/example/controller/ComplexController.java index de7486d..5e73aaf 100644 --- a/src/main/java/com/softawii/curupira/example/controller/ComplexController.java +++ b/src/main/java/com/softawii/example/controller/ComplexController.java @@ -1,4 +1,4 @@ -package com.softawii.curupira.example.controller; +package com.softawii.example.controller; import com.softawii.curupira.v2.annotations.DiscordController; import com.softawii.curupira.v2.annotations.RequestInfo; @@ -14,7 +14,6 @@ import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.MessageEmbed; -import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import net.dv8tion.jda.api.interactions.components.buttons.Button; diff --git a/src/main/java/com/softawii/curupira/example/controller/TranslatedController.java b/src/main/java/com/softawii/example/controller/TranslatedController.java similarity index 96% rename from src/main/java/com/softawii/curupira/example/controller/TranslatedController.java rename to src/main/java/com/softawii/example/controller/TranslatedController.java index a44cb17..c7ff5c8 100644 --- a/src/main/java/com/softawii/curupira/example/controller/TranslatedController.java +++ b/src/main/java/com/softawii/example/controller/TranslatedController.java @@ -1,4 +1,4 @@ -package com.softawii.curupira.example.controller; +package com.softawii.example.controller; import com.softawii.curupira.v2.annotations.DiscordController; import com.softawii.curupira.v2.annotations.LocaleType; diff --git a/src/main/java/com/softawii/curupira/example/exceptions/GenericExceptionHandler.java b/src/main/java/com/softawii/example/exceptions/GenericExceptionHandler.java similarity index 81% rename from src/main/java/com/softawii/curupira/example/exceptions/GenericExceptionHandler.java rename to src/main/java/com/softawii/example/exceptions/GenericExceptionHandler.java index 7dbee5f..0b781cb 100644 --- a/src/main/java/com/softawii/curupira/example/exceptions/GenericExceptionHandler.java +++ b/src/main/java/com/softawii/example/exceptions/GenericExceptionHandler.java @@ -1,11 +1,9 @@ -package com.softawii.curupira.example.exceptions; +package com.softawii.example.exceptions; import com.softawii.curupira.v2.annotations.DiscordException; import com.softawii.curupira.v2.annotations.DiscordExceptions; import net.dv8tion.jda.api.events.interaction.command.GenericCommandInteractionEvent; -import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.Interaction; -import net.dv8tion.jda.api.interactions.callbacks.IReplyCallback; import org.slf4j.Logger; import org.slf4j.LoggerFactory;