Merge pull request #23 from stelitop/dev

Update build.gradle

README.md

@@ -25,7 +25,7 @@ Since the library is based on Java Spring, it contains components that have to b
 - The first is to import the Mad4jConfig into a custom configuration component. This is the recommended way, as this way you have
   more control over the library. It is also easier to disable when testing needs to be done on other parts of the bot, such as testing JPA repositories.
   ```java
-  import net.stelitop.mad4j.Mad4jConfig;
+  import io.github.stelitop.mad4j.Mad4jConfig;
   import org.springframework.context.annotation.Configuration;
   import org.springframework.context.annotation.Import;
 
@@ -38,7 +38,7 @@ Since the library is based on Java Spring, it contains components that have to b
 - The second way is to directly import the Mad4jConfig to the main class of the Spring application. This is a bit simpler, but it might be problematic
   in bigger applications.
   ```java
-  import net.stelitop.mad4j.Mad4jConfig;
+  import io.github.stelitop.mad4j.Mad4jConfig;
   import org.springframework.boot.SpringApplication;
   import org.springframework.boot.autoconfigure.SpringBootApplication;
   import org.springframework.context.annotation.Import;

library/build.gradle

@@ -6,7 +6,7 @@ plugins {
 	id 'maven-publish'
 }
 
-group = 'net.stelitop'
+group = 'io.github.stelitop'
 version = '0.0.5'
 
 java {
@@ -40,29 +40,29 @@ dependencies {
 	testImplementation 'org.mockito:mockito-core:5.4.0'
 }
 
-publishing {
-	repositories {
-		maven {
-			name = "mad4j"
-			url = uri("https://maven.pkg.github.com/stelitop/mad4j")
-			credentials {
-				username = project.findProperty("gpr.user") ?: System.getenv("USERNAME")
-				password = project.findProperty("gpr.key") ?: System.getenv("TOKEN")
-			}
-		}
-	}
-	publications {
-		gpr(MavenPublication) {
-			from(components.java)
-		}
-	}
-}
+//publishing {
+//	repositories {
+//		maven {
+//			name = "mad4j"
+//			url = uri("https://maven.pkg.github.com/stelitop/mad4j")
+//			credentials {
+//				username = project.findProperty("gpr.user") ?: System.getenv("USERNAME")
+//				password = project.findProperty("gpr.key") ?: System.getenv("TOKEN")
+//			}
+//		}
+//	}
+//	publications {
+//		gpr(MavenPublication) {
+//			from(components.java)
+//		}
+//	}
+//}
 
 tasks.named('test') {
 	useJUnitPlatform()
 	jacoco {
 		enabled = true
-		includes = ['net.stelitop.mad4j.*']
+		includes = ['io.github.stelitop.mad4j.*']
 		excludes = []
 	}
 }
@@ -73,7 +73,7 @@ jacocoTestCoverageVerification() {
 		rule {
 			enabled = true
 			element = 'CLASS'
-			includes = ['net.stelitop.madj4.*']
+			includes = ['io.github.stelitop.madj4.*']
 
 			limit {
 				counter = 'BRANCH'

library/src/main/java/net/stelitop/mad4j/DiscordEventsComponent.java → library/src/main/java/io/github/stelitop/mad4j/DiscordEventsComponent.java

@@ -1,7 +1,7 @@
-package net.stelitop.mad4j;
+package io.github.stelitop.mad4j;
 
-import net.stelitop.mad4j.commands.SlashCommand;
-import net.stelitop.mad4j.commands.components.ComponentInteraction;
+import io.github.stelitop.mad4j.commands.SlashCommand;
+import io.github.stelitop.mad4j.commands.components.ComponentInteraction;
 import org.springframework.stereotype.Component;
 
 import java.lang.annotation.ElementType;

library/src/main/java/net/stelitop/mad4j/Mad4jConfig.java → library/src/main/java/io/github/stelitop/mad4j/Mad4jConfig.java

@@ -1,4 +1,4 @@
-package net.stelitop.mad4j;
+package io.github.stelitop.mad4j;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -8,7 +8,7 @@
  *
  * <p>This loads all components part of the package when used into another project.</p>
  */
-@ComponentScan("net.stelitop.mad4j")
+@ComponentScan("io.github.stelitop.mad4j")
 @Configuration
 public class Mad4jConfig {
 

library/src/main/java/net/stelitop/mad4j/commands/Command.java → library/src/main/java/io/github/stelitop/mad4j/commands/Command.java

@@ -1,4 +1,4 @@
-package net.stelitop.mad4j.commands;
+package io.github.stelitop.mad4j.commands;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

library/src/main/java/net/stelitop/mad4j/commands/CommandData.java → library/src/main/java/io/github/stelitop/mad4j/commands/CommandData.java

@@ -1,10 +1,10 @@
-package net.stelitop.mad4j.commands;
+package io.github.stelitop.mad4j.commands;
 
 import discord4j.core.GatewayDiscordClient;
+import io.github.stelitop.mad4j.DiscordEventsComponent;
 import lombok.Builder;
 import lombok.Getter;
-import net.stelitop.mad4j.DiscordEventsComponent;
-import net.stelitop.mad4j.listeners.CommandOptionAutocompleteListener;
+import io.github.stelitop.mad4j.listeners.CommandOptionAutocompleteListener;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

library/src/main/java/net/stelitop/mad4j/commands/CommandParam.java → library/src/main/java/io/github/stelitop/mad4j/commands/CommandParam.java

@@ -1,7 +1,7 @@
-package net.stelitop.mad4j.commands;
+package io.github.stelitop.mad4j.commands;
 
-import net.stelitop.mad4j.commands.autocomplete.AutocompletionExecutor;
-import net.stelitop.mad4j.commands.autocomplete.NullAutocompleteExecutor;
+import io.github.stelitop.mad4j.commands.autocomplete.AutocompletionExecutor;
+import io.github.stelitop.mad4j.commands.autocomplete.NullAutocompleteExecutor;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

library/src/main/java/net/stelitop/mad4j/commands/CommandParamChoice.java → library/src/main/java/io/github/stelitop/mad4j/commands/CommandParamChoice.java

@@ -1,4 +1,4 @@
-package net.stelitop.mad4j.commands;
+package io.github.stelitop.mad4j.commands;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

library/src/main/java/net/stelitop/mad4j/commands/CommandType.java → library/src/main/java/io/github/stelitop/mad4j/commands/CommandType.java

@@ -1,4 +1,4 @@
-package net.stelitop.mad4j.commands;
+package io.github.stelitop.mad4j.commands;
 
 public enum CommandType {
     Text,

library/src/main/java/net/stelitop/mad4j/commands/DefaultValue.java → library/src/main/java/io/github/stelitop/mad4j/commands/DefaultValue.java

@@ -1,4 +1,4 @@
-package net.stelitop.mad4j.commands;
+package io.github.stelitop.mad4j.commands;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

library/src/main/java/net/stelitop/mad4j/commands/InteractionEvent.java → library/src/main/java/io/github/stelitop/mad4j/commands/InteractionEvent.java

@@ -1,4 +1,4 @@
-package net.stelitop.mad4j.commands;
+package io.github.stelitop.mad4j.commands;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

library/src/main/java/net/stelitop/mad4j/commands/SlashCommand.java → library/src/main/java/io/github/stelitop/mad4j/commands/SlashCommand.java

@@ -1,4 +1,4 @@
-package net.stelitop.mad4j.commands;
+package io.github.stelitop.mad4j.commands;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

library/src/main/java/net/stelitop/mad4j/commands/SlashCommandRegistrar.java → library/src/main/java/io/github/stelitop/mad4j/commands/SlashCommandRegistrar.java

@@ -1,4 +1,4 @@
-package net.stelitop.mad4j.commands;
+package io.github.stelitop.mad4j.commands;
 
 import discord4j.core.GatewayDiscordClient;
 import discord4j.core.event.domain.interaction.ChatInputInteractionEvent;
@@ -8,15 +8,15 @@
 import discord4j.discordjson.json.ApplicationCommandRequest;
 import discord4j.discordjson.json.ImmutableApplicationCommandOptionData;
 import discord4j.rest.RestClient;
+import io.github.stelitop.mad4j.DiscordEventsComponent;
+import io.github.stelitop.mad4j.utils.ActionResult;
+import io.github.stelitop.mad4j.utils.OptionType;
 import lombok.AllArgsConstructor;
 import lombok.ToString;
-import net.stelitop.mad4j.DiscordEventsComponent;
-import net.stelitop.mad4j.commands.autocomplete.NullAutocompleteExecutor;
-import net.stelitop.mad4j.commands.convenience.EventUser;
-import net.stelitop.mad4j.commands.convenience.EventUserId;
-import net.stelitop.mad4j.listeners.CommandOptionAutocompleteListener;
-import net.stelitop.mad4j.utils.ActionResult;
-import net.stelitop.mad4j.utils.OptionType;
+import io.github.stelitop.mad4j.commands.autocomplete.NullAutocompleteExecutor;
+import io.github.stelitop.mad4j.commands.convenience.EventUser;
+import io.github.stelitop.mad4j.commands.convenience.EventUserId;
+import io.github.stelitop.mad4j.listeners.CommandOptionAutocompleteListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +25,6 @@
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 
-import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
 import java.util.*;
 import java.util.stream.Collectors;

library/src/main/java/net/stelitop/mad4j/commands/autocomplete/AutocompletionExecutor.java → library/src/main/java/io/github/stelitop/mad4j/commands/autocomplete/AutocompletionExecutor.java

@@ -1,7 +1,7 @@
-package net.stelitop.mad4j.commands.autocomplete;
+package io.github.stelitop.mad4j.commands.autocomplete;
 
 import discord4j.core.event.domain.interaction.ChatInputAutoCompleteEvent;
-import net.stelitop.mad4j.commands.CommandParam;
+import io.github.stelitop.mad4j.commands.CommandParam;
 
 import java.util.List;
 

library/src/main/java/net/stelitop/mad4j/commands/autocomplete/InputSuggestion.java → library/src/main/java/io/github/stelitop/mad4j/commands/autocomplete/InputSuggestion.java

@@ -1,4 +1,4 @@
-package net.stelitop.mad4j.commands.autocomplete;
+package io.github.stelitop.mad4j.commands.autocomplete;
 
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;

library/src/main/java/net/stelitop/mad4j/commands/autocomplete/NullAutocompleteExecutor.java → library/src/main/java/io/github/stelitop/mad4j/commands/autocomplete/NullAutocompleteExecutor.java

@@ -1,4 +1,4 @@
-package net.stelitop.mad4j.commands.autocomplete;
+package io.github.stelitop.mad4j.commands.autocomplete;
 
 import discord4j.core.event.domain.interaction.ChatInputAutoCompleteEvent;
 

library/src/main/java/net/stelitop/mad4j/commands/components/ComponentInteraction.java → library/src/main/java/io/github/stelitop/mad4j/commands/components/ComponentInteraction.java

@@ -1,4 +1,4 @@
-package net.stelitop.mad4j.commands.components;
+package io.github.stelitop.mad4j.commands.components;
 
 import discord4j.core.event.domain.interaction.ComponentInteractionEvent;
 import org.intellij.lang.annotations.RegExp;

library/src/main/java/net/stelitop/mad4j/commands/convenience/EventUser.java → library/src/main/java/io/github/stelitop/mad4j/commands/convenience/EventUser.java

@@ -1,4 +1,4 @@
-package net.stelitop.mad4j.commands.convenience;
+package io.github.stelitop.mad4j.commands.convenience;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

library/src/main/java/net/stelitop/mad4j/commands/convenience/EventUserId.java → library/src/main/java/io/github/stelitop/mad4j/commands/convenience/EventUserId.java

@@ -1,4 +1,4 @@
-package net.stelitop.mad4j.commands.convenience;
+package io.github.stelitop.mad4j.commands.convenience;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

library/src/main/java/net/stelitop/mad4j/commands/requirements/CommandRequirement.java → library/src/main/java/io/github/stelitop/mad4j/commands/requirements/CommandRequirement.java

@@ -1,4 +1,4 @@
-package net.stelitop.mad4j.commands.requirements;
+package io.github.stelitop.mad4j.commands.requirements;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

library/src/main/java/net/stelitop/mad4j/commands/requirements/CommandRequirementExecutor.java → library/src/main/java/io/github/stelitop/mad4j/commands/requirements/CommandRequirementExecutor.java

@@ -1,7 +1,7 @@
-package net.stelitop.mad4j.commands.requirements;
+package io.github.stelitop.mad4j.commands.requirements;
 
 import discord4j.core.event.domain.interaction.ChatInputInteractionEvent;
-import net.stelitop.mad4j.utils.ActionResult;
+import io.github.stelitop.mad4j.utils.ActionResult;
 
 /**
  * Interface for creating implementations of a custom command requirement. The extending

library/src/main/java/net/stelitop/mad4j/commands/requirements/standard/DMCommandRequirement.java → library/src/main/java/io/github/stelitop/mad4j/commands/requirements/standard/DMCommandRequirement.java

@@ -1,6 +1,6 @@
-package net.stelitop.mad4j.commands.requirements.standard;
+package io.github.stelitop.mad4j.commands.requirements.standard;
 
-import net.stelitop.mad4j.commands.requirements.CommandRequirement;
+import io.github.stelitop.mad4j.commands.requirements.CommandRequirement;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

library/src/main/java/net/stelitop/mad4j/commands/requirements/standard/DMCommandRequirementImplementation.java → library/src/main/java/io/github/stelitop/mad4j/commands/requirements/standard/DMCommandRequirementImplementation.java

@@ -1,13 +1,11 @@
-package net.stelitop.mad4j.commands.requirements.standard;
+package io.github.stelitop.mad4j.commands.requirements.standard;
 
 import discord4j.core.event.domain.interaction.ChatInputInteractionEvent;
 import discord4j.core.object.entity.channel.Channel;
 import discord4j.core.object.entity.channel.MessageChannel;
-import net.stelitop.mad4j.DiscordEventsComponent;
-import net.stelitop.mad4j.commands.requirements.CommandRequirement;
-import net.stelitop.mad4j.commands.requirements.CommandRequirementExecutor;
-import net.stelitop.mad4j.utils.ActionResult;
-import org.springframework.stereotype.Component;
+import io.github.stelitop.mad4j.DiscordEventsComponent;
+import io.github.stelitop.mad4j.utils.ActionResult;
+import io.github.stelitop.mad4j.commands.requirements.CommandRequirementExecutor;
 
 @DiscordEventsComponent
 public class DMCommandRequirementImplementation implements CommandRequirementExecutor {

library/src/main/java/net/stelitop/mad4j/commands/requirements/standard/GuildCommandRequirement.java → library/src/main/java/io/github/stelitop/mad4j/commands/requirements/standard/GuildCommandRequirement.java

@@ -1,6 +1,6 @@
-package net.stelitop.mad4j.commands.requirements.standard;
+package io.github.stelitop.mad4j.commands.requirements.standard;
 
-import net.stelitop.mad4j.commands.requirements.CommandRequirement;
+import io.github.stelitop.mad4j.commands.requirements.CommandRequirement;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

library/src/main/java/net/stelitop/mad4j/commands/requirements/standard/GuildCommandRequirementImplementation.java → library/src/main/java/io/github/stelitop/mad4j/commands/requirements/standard/GuildCommandRequirementImplementation.java

@@ -1,11 +1,9 @@
-package net.stelitop.mad4j.commands.requirements.standard;
+package io.github.stelitop.mad4j.commands.requirements.standard;
 
 import discord4j.core.event.domain.interaction.ChatInputInteractionEvent;
-import net.stelitop.mad4j.DiscordEventsComponent;
-import net.stelitop.mad4j.commands.requirements.CommandRequirement;
-import net.stelitop.mad4j.commands.requirements.CommandRequirementExecutor;
-import net.stelitop.mad4j.utils.ActionResult;
-import org.springframework.stereotype.Component;
+import io.github.stelitop.mad4j.DiscordEventsComponent;
+import io.github.stelitop.mad4j.utils.ActionResult;
+import io.github.stelitop.mad4j.commands.requirements.CommandRequirementExecutor;
 
 @DiscordEventsComponent
 public class GuildCommandRequirementImplementation implements CommandRequirementExecutor {

library/src/main/java/net/stelitop/mad4j/events/AllowedEventResult.java → library/src/main/java/io/github/stelitop/mad4j/events/AllowedEventResult.java

@@ -1,4 +1,4 @@
-package net.stelitop.mad4j.events;
+package io.github.stelitop.mad4j.events;
 
 import discord4j.core.event.domain.Event;
 import reactor.core.publisher.Mono;

library/src/main/java/net/stelitop/mad4j/events/AllowedEventResultHandler.java → library/src/main/java/io/github/stelitop/mad4j/events/AllowedEventResultHandler.java

@@ -1,7 +1,7 @@
-package net.stelitop.mad4j.events;
+package io.github.stelitop.mad4j.events;
 
 import discord4j.core.event.domain.Event;
-import net.stelitop.mad4j.utils.ActionResult;
+import io.github.stelitop.mad4j.utils.ActionResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import reactor.core.publisher.Mono;

library/src/main/java/net/stelitop/mad4j/events/SlashCommandEmbedCreateSpecEventResult.java → library/src/main/java/io/github/stelitop/mad4j/events/SlashCommandEmbedCreateSpecEventResult.java

@@ -1,4 +1,4 @@
-package net.stelitop.mad4j.events;
+package io.github.stelitop.mad4j.events;
 
 import discord4j.core.event.domain.Event;
 import discord4j.core.event.domain.interaction.ChatInputInteractionEvent;

library/src/main/java/net/stelitop/mad4j/events/SlashCommandEventResponseEventResult.java → library/src/main/java/io/github/stelitop/mad4j/events/SlashCommandEventResponseEventResult.java

@@ -1,9 +1,9 @@
-package net.stelitop.mad4j.events;
+package io.github.stelitop.mad4j.events;
 
 import discord4j.core.event.domain.Event;
 import discord4j.core.event.domain.interaction.ChatInputInteractionEvent;
 import discord4j.core.event.domain.interaction.InteractionCreateEvent;
-import net.stelitop.mad4j.interactions.EventResponse;
+import io.github.stelitop.mad4j.interactions.EventResponse;
 import org.springframework.stereotype.Component;
 import reactor.core.publisher.Mono;
 

library/src/main/java/net/stelitop/mad4j/events/SlashCommandMonoVoidEventResult.java → library/src/main/java/io/github/stelitop/mad4j/events/SlashCommandMonoVoidEventResult.java

@@ -1,4 +1,4 @@
-package net.stelitop.mad4j.events;
+package io.github.stelitop.mad4j.events;
 
 import discord4j.core.event.domain.Event;
 import discord4j.core.event.domain.interaction.ChatInputInteractionEvent;

library/src/main/java/net/stelitop/mad4j/events/SlashCommandStringEventResult.java → library/src/main/java/io/github/stelitop/mad4j/events/SlashCommandStringEventResult.java

@@ -1,4 +1,4 @@
-package net.stelitop.mad4j.events;
+package io.github.stelitop.mad4j.events;
 
 import discord4j.core.event.domain.Event;
 import discord4j.core.event.domain.interaction.ChatInputInteractionEvent;

library/src/main/java/net/stelitop/mad4j/interactions/EventResponse.java → library/src/main/java/io/github/stelitop/mad4j/interactions/EventResponse.java

@@ -1,18 +1,13 @@
-package net.stelitop.mad4j.interactions;
+package io.github.stelitop.mad4j.interactions;
 
 import discord4j.core.event.domain.interaction.ChatInputInteractionEvent;
 import discord4j.core.event.domain.interaction.ComponentInteractionEvent;
 import discord4j.core.event.domain.interaction.InteractionCreateEvent;
 import discord4j.core.object.component.LayoutComponent;
 import discord4j.core.spec.EmbedCreateSpec;
 import discord4j.core.spec.InteractionApplicationCommandCallbackReplyMono;
-import net.stelitop.mad4j.commands.components.ComponentInteraction;
 import reactor.core.publisher.Mono;
 
-import java.awt.*;
-import java.util.ArrayList;
-import java.util.List;
-
 public class EventResponse {
 
     private enum ResponseContent {

library/src/main/java/net/stelitop/mad4j/listeners/CommandOptionAutocompleteListener.java → library/src/main/java/io/github/stelitop/mad4j/listeners/CommandOptionAutocompleteListener.java

@@ -1,12 +1,12 @@
-package net.stelitop.mad4j.listeners;
+package io.github.stelitop.mad4j.listeners;
 
 import discord4j.core.GatewayDiscordClient;
 import discord4j.core.event.domain.interaction.ChatInputAutoCompleteEvent;
 import discord4j.core.object.command.ApplicationCommandInteractionOption;
 import discord4j.discordjson.json.ApplicationCommandOptionChoiceData;
-import net.stelitop.mad4j.utils.OptionType;
-import net.stelitop.mad4j.commands.autocomplete.AutocompletionExecutor;
-import net.stelitop.mad4j.commands.autocomplete.InputSuggestion;
+import io.github.stelitop.mad4j.utils.OptionType;
+import io.github.stelitop.mad4j.commands.autocomplete.AutocompletionExecutor;
+import io.github.stelitop.mad4j.commands.autocomplete.InputSuggestion;
 import org.apache.commons.lang3.tuple.Pair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;