diff --git a/api/src/ap/java/com/discordsrv/api/processor/SubscribeProcessor.java b/api/src/ap/java/com/discordsrv/api/processor/SubscribeProcessor.java index e6549218..a03daf1d 100644 --- a/api/src/ap/java/com/discordsrv/api/processor/SubscribeProcessor.java +++ b/api/src/ap/java/com/discordsrv/api/processor/SubscribeProcessor.java @@ -23,7 +23,7 @@ package com.discordsrv.api.processor; -import com.discordsrv.api.event.bus.Subscribe; +import com.discordsrv.api.eventbus.Subscribe; import javax.annotation.processing.*; import javax.lang.model.SourceVersion; diff --git a/api/src/main/java/com/discordsrv/api/DiscordSRVApi.java b/api/src/main/java/com/discordsrv/api/DiscordSRVApi.java index 8224390a..743db03e 100644 --- a/api/src/main/java/com/discordsrv/api/DiscordSRVApi.java +++ b/api/src/main/java/com/discordsrv/api/DiscordSRVApi.java @@ -26,7 +26,7 @@ package com.discordsrv.api; import com.discordsrv.api.component.MinecraftComponentFactory; import com.discordsrv.api.discord.DiscordAPI; import com.discordsrv.api.discord.connection.details.DiscordConnectionDetails; -import com.discordsrv.api.event.bus.EventBus; +import com.discordsrv.api.eventbus.EventBus; import com.discordsrv.api.placeholder.PlaceholderService; import com.discordsrv.api.placeholder.format.PlainPlaceholderFormat; import com.discordsrv.api.player.DiscordSRVPlayer; diff --git a/api/src/main/java/com/discordsrv/api/discord/entity/interaction/command/CommandOption.java b/api/src/main/java/com/discordsrv/api/discord/entity/interaction/command/CommandOption.java index c6c07c07..3da32240 100644 --- a/api/src/main/java/com/discordsrv/api/discord/entity/interaction/command/CommandOption.java +++ b/api/src/main/java/com/discordsrv/api/discord/entity/interaction/command/CommandOption.java @@ -25,6 +25,7 @@ package com.discordsrv.api.discord.entity.interaction.command; import com.discordsrv.api.discord.entity.JDAEntity; import com.discordsrv.api.discord.entity.channel.DiscordChannelType; +import com.discordsrv.api.events.discord.interaction.command.DiscordCommandAutoCompleteInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.jetbrains.annotations.NotNull; @@ -229,11 +230,11 @@ public class CommandOption implements JDAEntity { } /** - * Sets if this option is auto completed. See {@link com.discordsrv.api.event.events.discord.interaction.command.DiscordCommandAutoCompleteInteractionEvent}. + * Sets if this option is auto completed. See {@link DiscordCommandAutoCompleteInteractionEvent}. * * @param autoComplete is this choice auto completing * @return this builder, useful for chaining - * @see com.discordsrv.api.event.events.discord.interaction.command.DiscordCommandAutoCompleteInteractionEvent + * @see DiscordCommandAutoCompleteInteractionEvent */ @NotNull public Builder setAutoComplete(boolean autoComplete) { diff --git a/api/src/main/java/com/discordsrv/api/discord/entity/interaction/command/DiscordCommand.java b/api/src/main/java/com/discordsrv/api/discord/entity/interaction/command/DiscordCommand.java index 53fbc33d..02d320ff 100644 --- a/api/src/main/java/com/discordsrv/api/discord/entity/interaction/command/DiscordCommand.java +++ b/api/src/main/java/com/discordsrv/api/discord/entity/interaction/command/DiscordCommand.java @@ -25,7 +25,7 @@ package com.discordsrv.api.discord.entity.interaction.command; import com.discordsrv.api.discord.entity.JDAEntity; import com.discordsrv.api.discord.entity.interaction.component.ComponentIdentifier; -import com.discordsrv.api.event.events.discord.interaction.command.*; +import com.discordsrv.api.events.discord.interaction.command.*; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions; import net.dv8tion.jda.api.interactions.commands.build.*; @@ -52,7 +52,7 @@ public class DiscordCommand implements JDAEntity { * @param name the name of the command, 1-32 characters alphanumeric and dashes * @param description the description of the command * @return a new chat input command builder - * @see com.discordsrv.api.event.events.discord.interaction.command.DiscordChatInputInteractionEvent + * @see DiscordChatInputInteractionEvent */ public static ChatInputBuilder chatInput( ComponentIdentifier id, @@ -71,7 +71,7 @@ public class DiscordCommand implements JDAEntity { * @param id a unique identifier for this interaction, used to check if a given event was for this interaction * @param name the name of the command, 1-32 characters * @return a new command builder - * @see com.discordsrv.api.event.events.discord.interaction.command.DiscordUserContextInteractionEvent + * @see DiscordUserContextInteractionEvent */ public static Builder user( ComponentIdentifier id, @@ -86,7 +86,7 @@ public class DiscordCommand implements JDAEntity { * @param id a unique identifier for this interaction, used to check if a given event was for this interaction * @param name the name of the command, 1-32 characters * @return a new command builder - * @see com.discordsrv.api.event.events.discord.interaction.command.DiscordMessageContextInteractionEvent + * @see DiscordMessageContextInteractionEvent */ public static Builder message( ComponentIdentifier id, diff --git a/api/src/main/java/com/discordsrv/api/discord/entity/interaction/component/impl/Button.java b/api/src/main/java/com/discordsrv/api/discord/entity/interaction/component/impl/Button.java index 65a03810..e6b0e581 100644 --- a/api/src/main/java/com/discordsrv/api/discord/entity/interaction/component/impl/Button.java +++ b/api/src/main/java/com/discordsrv/api/discord/entity/interaction/component/impl/Button.java @@ -26,6 +26,7 @@ package com.discordsrv.api.discord.entity.interaction.component.impl; import com.discordsrv.api.discord.entity.guild.DiscordCustomEmoji; import com.discordsrv.api.discord.entity.interaction.component.ComponentIdentifier; import com.discordsrv.api.discord.entity.interaction.component.MessageComponent; +import com.discordsrv.api.events.discord.interaction.component.DiscordButtonInteractionEvent; import net.dv8tion.jda.api.entities.emoji.Emoji; import net.dv8tion.jda.api.interactions.components.ItemComponent; import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle; @@ -38,7 +39,7 @@ import java.util.UUID; * A Discord button. * @see #builder(ComponentIdentifier, Style) * @see #urlBuilder(String) - * @see com.discordsrv.api.event.events.discord.interaction.component.DiscordButtonInteractionEvent + * @see DiscordButtonInteractionEvent */ public class Button implements MessageComponent { diff --git a/api/src/main/java/com/discordsrv/api/discord/entity/interaction/component/impl/Modal.java b/api/src/main/java/com/discordsrv/api/discord/entity/interaction/component/impl/Modal.java index 343d0f5c..e0304b6c 100644 --- a/api/src/main/java/com/discordsrv/api/discord/entity/interaction/component/impl/Modal.java +++ b/api/src/main/java/com/discordsrv/api/discord/entity/interaction/component/impl/Modal.java @@ -27,6 +27,7 @@ import com.discordsrv.api.discord.entity.JDAEntity; import com.discordsrv.api.discord.entity.interaction.component.ComponentIdentifier; import com.discordsrv.api.discord.entity.interaction.component.actionrow.ActionRow; import com.discordsrv.api.discord.entity.interaction.component.actionrow.ModalActionRow; +import com.discordsrv.api.events.discord.interaction.DiscordModalInteractionEvent; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; @@ -37,7 +38,7 @@ import java.util.stream.Collectors; /** * A Discord modal. * @see #builder(ComponentIdentifier, String) - * @see com.discordsrv.api.event.events.discord.interaction.DiscordModalInteractionEvent + * @see DiscordModalInteractionEvent */ public class Modal implements JDAEntity { diff --git a/api/src/main/java/com/discordsrv/api/discord/entity/interaction/component/impl/SelectMenu.java b/api/src/main/java/com/discordsrv/api/discord/entity/interaction/component/impl/SelectMenu.java index 6e992b30..516c013c 100644 --- a/api/src/main/java/com/discordsrv/api/discord/entity/interaction/component/impl/SelectMenu.java +++ b/api/src/main/java/com/discordsrv/api/discord/entity/interaction/component/impl/SelectMenu.java @@ -26,6 +26,7 @@ package com.discordsrv.api.discord.entity.interaction.component.impl; import com.discordsrv.api.discord.entity.guild.DiscordCustomEmoji; import com.discordsrv.api.discord.entity.interaction.component.ComponentIdentifier; import com.discordsrv.api.discord.entity.interaction.component.MessageComponent; +import com.discordsrv.api.events.discord.interaction.component.DiscordSelectMenuInteractionEvent; import net.dv8tion.jda.api.entities.emoji.Emoji; import net.dv8tion.jda.api.interactions.components.ItemComponent; import org.jetbrains.annotations.CheckReturnValue; @@ -38,7 +39,7 @@ import java.util.List; /** * A Discord selection menu. * @see #builder(ComponentIdentifier) - * @see com.discordsrv.api.event.events.discord.interaction.component.DiscordSelectMenuInteractionEvent + * @see DiscordSelectMenuInteractionEvent */ // TODO: newest changes public class SelectMenu implements MessageComponent { diff --git a/api/src/main/java/com/discordsrv/api/discord/entity/message/impl/SendableDiscordMessageImpl.java b/api/src/main/java/com/discordsrv/api/discord/entity/message/impl/SendableDiscordMessageImpl.java index 93323681..68fe42ab 100644 --- a/api/src/main/java/com/discordsrv/api/discord/entity/message/impl/SendableDiscordMessageImpl.java +++ b/api/src/main/java/com/discordsrv/api/discord/entity/message/impl/SendableDiscordMessageImpl.java @@ -29,8 +29,8 @@ import com.discordsrv.api.discord.entity.message.AllowedMention; import com.discordsrv.api.discord.entity.message.DiscordMessageEmbed; import com.discordsrv.api.discord.entity.message.SendableDiscordMessage; import com.discordsrv.api.discord.util.DiscordFormattingUtil; -import com.discordsrv.api.placeholder.format.FormattedText; import com.discordsrv.api.placeholder.PlaceholderService; +import com.discordsrv.api.placeholder.format.FormattedText; import com.discordsrv.api.placeholder.format.PlainPlaceholderFormat; import com.discordsrv.api.placeholder.util.Placeholders; import net.dv8tion.jda.api.entities.MessageEmbed; diff --git a/api/src/main/java/com/discordsrv/api/event/bus/EventBus.java b/api/src/main/java/com/discordsrv/api/eventbus/EventBus.java similarity index 97% rename from api/src/main/java/com/discordsrv/api/event/bus/EventBus.java rename to api/src/main/java/com/discordsrv/api/eventbus/EventBus.java index ef9ab666..f47b92b9 100644 --- a/api/src/main/java/com/discordsrv/api/event/bus/EventBus.java +++ b/api/src/main/java/com/discordsrv/api/eventbus/EventBus.java @@ -21,9 +21,9 @@ * SOFTWARE. */ -package com.discordsrv.api.event.bus; +package com.discordsrv.api.eventbus; -import com.discordsrv.api.event.events.Event; +import com.discordsrv.api.events.Event; import net.dv8tion.jda.api.events.GenericEvent; import org.jetbrains.annotations.Blocking; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/com/discordsrv/api/event/bus/EventListener.java b/api/src/main/java/com/discordsrv/api/eventbus/EventListener.java similarity index 91% rename from api/src/main/java/com/discordsrv/api/event/bus/EventListener.java rename to api/src/main/java/com/discordsrv/api/eventbus/EventListener.java index 174c5fde..85eeda24 100644 --- a/api/src/main/java/com/discordsrv/api/event/bus/EventListener.java +++ b/api/src/main/java/com/discordsrv/api/eventbus/EventListener.java @@ -21,8 +21,9 @@ * SOFTWARE. */ -package com.discordsrv.api.event.bus; +package com.discordsrv.api.eventbus; +import com.discordsrv.api.events.Event; import org.jetbrains.annotations.NotNull; import java.lang.reflect.Method; @@ -51,7 +52,7 @@ public interface EventListener { /** * The event this listener is listening to. - * @return the event extending {@link com.discordsrv.api.event.events.Event} or {@link net.dv8tion.jda.api.events.GenericEvent} + * @return the event extending {@link Event} or {@link net.dv8tion.jda.api.events.GenericEvent} */ @NotNull Class eventClass(); diff --git a/api/src/main/java/com/discordsrv/api/event/bus/EventPriority.java b/api/src/main/java/com/discordsrv/api/eventbus/EventPriority.java similarity index 89% rename from api/src/main/java/com/discordsrv/api/event/bus/EventPriority.java rename to api/src/main/java/com/discordsrv/api/eventbus/EventPriority.java index c4e63bf9..440f6c16 100644 --- a/api/src/main/java/com/discordsrv/api/event/bus/EventPriority.java +++ b/api/src/main/java/com/discordsrv/api/eventbus/EventPriority.java @@ -21,7 +21,9 @@ * SOFTWARE. */ -package com.discordsrv.api.event.bus; +package com.discordsrv.api.eventbus; + +import com.discordsrv.api.events.Processable; /** * A simple enum to dictate the order that event listeners will be executed, going from {@link #POST} to {@link #POST}. @@ -45,17 +47,17 @@ public enum EventPriority { /** * The default priority, right in the middle of the priority order. Use this if you need to override - * one of DiscordSRV's implementations for {@link com.discordsrv.api.event.events.Processable}s. + * one of DiscordSRV's implementations for {@link Processable}s. */ DEFAULT, /** - * This is where DiscordSRV's integrations for other plugins will process {@link com.discordsrv.api.event.events.Processable}'s. + * This is where DiscordSRV's integrations for other plugins will process {@link Processable}'s. */ LATE, /** - * This is where DiscordSRV's default implementations for {@link com.discordsrv.api.event.events.Processable}'s will run. + * This is where DiscordSRV's default implementations for {@link Processable}'s will run. */ LAST, diff --git a/api/src/main/java/com/discordsrv/api/event/bus/Subscribe.java b/api/src/main/java/com/discordsrv/api/eventbus/Subscribe.java similarity index 94% rename from api/src/main/java/com/discordsrv/api/event/bus/Subscribe.java rename to api/src/main/java/com/discordsrv/api/eventbus/Subscribe.java index 03a0b51e..54453561 100644 --- a/api/src/main/java/com/discordsrv/api/event/bus/Subscribe.java +++ b/api/src/main/java/com/discordsrv/api/eventbus/Subscribe.java @@ -21,11 +21,11 @@ * SOFTWARE. */ -package com.discordsrv.api.event.bus; +package com.discordsrv.api.eventbus; import com.discordsrv.api.DiscordSRVApi; -import com.discordsrv.api.event.events.Cancellable; -import com.discordsrv.api.event.events.Event; +import com.discordsrv.api.events.Cancellable; +import com.discordsrv.api.events.Event; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/api/src/main/java/com/discordsrv/api/event/bus/internal/EventStateHolder.java b/api/src/main/java/com/discordsrv/api/eventbus/internal/EventStateHolder.java similarity index 95% rename from api/src/main/java/com/discordsrv/api/event/bus/internal/EventStateHolder.java rename to api/src/main/java/com/discordsrv/api/eventbus/internal/EventStateHolder.java index a0d98827..9f346b90 100644 --- a/api/src/main/java/com/discordsrv/api/event/bus/internal/EventStateHolder.java +++ b/api/src/main/java/com/discordsrv/api/eventbus/internal/EventStateHolder.java @@ -21,9 +21,9 @@ * SOFTWARE. */ -package com.discordsrv.api.event.bus.internal; +package com.discordsrv.api.eventbus.internal; -import com.discordsrv.api.event.bus.EventListener; +import com.discordsrv.api.eventbus.EventListener; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/com/discordsrv/api/event/events/Cancellable.java b/api/src/main/java/com/discordsrv/api/events/Cancellable.java similarity index 91% rename from api/src/main/java/com/discordsrv/api/event/events/Cancellable.java rename to api/src/main/java/com/discordsrv/api/events/Cancellable.java index 23ccb3e1..6b1743c9 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/Cancellable.java +++ b/api/src/main/java/com/discordsrv/api/events/Cancellable.java @@ -21,11 +21,12 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events; +package com.discordsrv.api.events; -import com.discordsrv.api.event.bus.EventListener; -import com.discordsrv.api.event.bus.Subscribe; -import com.discordsrv.api.event.bus.internal.EventStateHolder; +import com.discordsrv.api.eventbus.EventBus; +import com.discordsrv.api.eventbus.EventListener; +import com.discordsrv.api.eventbus.Subscribe; +import com.discordsrv.api.eventbus.internal.EventStateHolder; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; @@ -52,7 +53,7 @@ public interface Cancellable extends Event { * Returns the {@link EventListener} that cancelled this event. * This is changed every time the event goes from not being cancelled to being cancelled. * - * @return the event listener that cancelled this event or {@code null} if it was cancelled before being passed to the {@link com.discordsrv.api.event.bus.EventBus} + * @return the event listener that cancelled this event or {@code null} if it was cancelled before being passed to the {@link EventBus} * @throws IllegalStateException if the event isn't cancelled */ @ApiStatus.NonExtendable diff --git a/api/src/main/java/com/discordsrv/api/event/events/Event.java b/api/src/main/java/com/discordsrv/api/events/Event.java similarity index 96% rename from api/src/main/java/com/discordsrv/api/event/events/Event.java rename to api/src/main/java/com/discordsrv/api/events/Event.java index 3cd217e0..ff0bea80 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/Event.java +++ b/api/src/main/java/com/discordsrv/api/events/Event.java @@ -21,7 +21,7 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events; +package com.discordsrv.api.events; /** * A DiscordSRV event. diff --git a/api/src/main/java/com/discordsrv/api/event/events/PlayerEvent.java b/api/src/main/java/com/discordsrv/api/events/PlayerEvent.java similarity index 97% rename from api/src/main/java/com/discordsrv/api/event/events/PlayerEvent.java rename to api/src/main/java/com/discordsrv/api/events/PlayerEvent.java index d07c16d5..37561e9f 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/PlayerEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/PlayerEvent.java @@ -21,7 +21,7 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events; +package com.discordsrv.api.events; import com.discordsrv.api.player.DiscordSRVPlayer; diff --git a/api/src/main/java/com/discordsrv/api/event/events/Processable.java b/api/src/main/java/com/discordsrv/api/events/Processable.java similarity index 93% rename from api/src/main/java/com/discordsrv/api/event/events/Processable.java rename to api/src/main/java/com/discordsrv/api/events/Processable.java index df27b655..5c5da22d 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/Processable.java +++ b/api/src/main/java/com/discordsrv/api/events/Processable.java @@ -21,10 +21,11 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events; +package com.discordsrv.api.events; -import com.discordsrv.api.event.bus.EventListener; -import com.discordsrv.api.event.bus.internal.EventStateHolder; +import com.discordsrv.api.eventbus.EventBus; +import com.discordsrv.api.eventbus.EventListener; +import com.discordsrv.api.eventbus.internal.EventStateHolder; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; @@ -43,7 +44,7 @@ public interface Processable extends Event { /** * Returns the {@link EventListener} that processed this event. * - * @return the event listener that processed this event or {@code null} if it was processed before being passed to the {@link com.discordsrv.api.event.bus.EventBus} + * @return the event listener that processed this event or {@code null} if it was processed before being passed to the {@link EventBus} * @throws IllegalStateException if the event has not been processed */ @ApiStatus.NonExtendable diff --git a/api/src/main/java/com/discordsrv/api/event/events/channel/GameChannelLookupEvent.java b/api/src/main/java/com/discordsrv/api/events/channel/GameChannelLookupEvent.java similarity index 95% rename from api/src/main/java/com/discordsrv/api/event/events/channel/GameChannelLookupEvent.java rename to api/src/main/java/com/discordsrv/api/events/channel/GameChannelLookupEvent.java index a07a1a93..a2a87247 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/channel/GameChannelLookupEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/channel/GameChannelLookupEvent.java @@ -21,17 +21,18 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.channel; +package com.discordsrv.api.events.channel; import com.discordsrv.api.channel.GameChannel; -import com.discordsrv.api.event.events.Processable; +import com.discordsrv.api.eventbus.EventPriority; +import com.discordsrv.api.events.Processable; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** * This event is used to lookup {@link GameChannel}s by their name (and optionally plugin name). * This is also used to determine which plugin's channel should take priority when multiple plugins - * define channels with the same name ({@link com.discordsrv.api.event.bus.EventPriority}). + * define channels with the same name ({@link EventPriority}). * * @see #isDefault() */ diff --git a/api/src/main/java/com/discordsrv/api/event/events/discord/AbstractDiscordEvent.java b/api/src/main/java/com/discordsrv/api/events/discord/AbstractDiscordEvent.java similarity index 97% rename from api/src/main/java/com/discordsrv/api/event/events/discord/AbstractDiscordEvent.java rename to api/src/main/java/com/discordsrv/api/events/discord/AbstractDiscordEvent.java index c9db14aa..554572a5 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/discord/AbstractDiscordEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/discord/AbstractDiscordEvent.java @@ -21,7 +21,7 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.discord; +package com.discordsrv.api.events.discord; import net.dv8tion.jda.api.events.GenericEvent; diff --git a/api/src/main/java/com/discordsrv/api/event/events/discord/DiscordEvent.java b/api/src/main/java/com/discordsrv/api/events/discord/DiscordEvent.java similarity index 93% rename from api/src/main/java/com/discordsrv/api/event/events/discord/DiscordEvent.java rename to api/src/main/java/com/discordsrv/api/events/discord/DiscordEvent.java index 51fdd879..e7e3d278 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/discord/DiscordEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/discord/DiscordEvent.java @@ -21,10 +21,10 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.discord; +package com.discordsrv.api.events.discord; import com.discordsrv.api.discord.entity.JDAEntity; -import com.discordsrv.api.event.events.Event; +import com.discordsrv.api.events.Event; import net.dv8tion.jda.api.events.GenericEvent; public interface DiscordEvent extends Event, JDAEntity { diff --git a/api/src/main/java/com/discordsrv/api/event/events/discord/interaction/AbstractDeferrableInteractionEvent.java b/api/src/main/java/com/discordsrv/api/events/discord/interaction/AbstractDeferrableInteractionEvent.java similarity index 97% rename from api/src/main/java/com/discordsrv/api/event/events/discord/interaction/AbstractDeferrableInteractionEvent.java rename to api/src/main/java/com/discordsrv/api/events/discord/interaction/AbstractDeferrableInteractionEvent.java index 993283bc..f6262839 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/discord/interaction/AbstractDeferrableInteractionEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/discord/interaction/AbstractDeferrableInteractionEvent.java @@ -21,7 +21,7 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.discord.interaction; +package com.discordsrv.api.events.discord.interaction; import com.discordsrv.api.discord.entity.DiscordUser; import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel; diff --git a/api/src/main/java/com/discordsrv/api/event/events/discord/interaction/AbstractInteractionEvent.java b/api/src/main/java/com/discordsrv/api/events/discord/interaction/AbstractInteractionEvent.java similarity index 91% rename from api/src/main/java/com/discordsrv/api/event/events/discord/interaction/AbstractInteractionEvent.java rename to api/src/main/java/com/discordsrv/api/events/discord/interaction/AbstractInteractionEvent.java index 1dcab08b..4aeef39b 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/discord/interaction/AbstractInteractionEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/discord/interaction/AbstractInteractionEvent.java @@ -21,19 +21,20 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.discord.interaction; +package com.discordsrv.api.events.discord.interaction; import com.discordsrv.api.discord.entity.DiscordUser; import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel; import com.discordsrv.api.discord.entity.guild.DiscordGuild; import com.discordsrv.api.discord.entity.guild.DiscordGuildMember; import com.discordsrv.api.discord.entity.interaction.component.ComponentIdentifier; -import com.discordsrv.api.event.events.discord.AbstractDiscordEvent; +import com.discordsrv.api.events.discord.AbstractDiscordEvent; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -public abstract class AbstractInteractionEvent extends AbstractDiscordEvent { +public abstract class AbstractInteractionEvent extends + AbstractDiscordEvent { protected final ComponentIdentifier identifier; protected final DiscordUser user; diff --git a/api/src/main/java/com/discordsrv/api/event/events/discord/interaction/DiscordModalInteractionEvent.java b/api/src/main/java/com/discordsrv/api/events/discord/interaction/DiscordModalInteractionEvent.java similarity index 97% rename from api/src/main/java/com/discordsrv/api/event/events/discord/interaction/DiscordModalInteractionEvent.java rename to api/src/main/java/com/discordsrv/api/events/discord/interaction/DiscordModalInteractionEvent.java index fa3badda..6a929cb9 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/discord/interaction/DiscordModalInteractionEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/discord/interaction/DiscordModalInteractionEvent.java @@ -21,7 +21,7 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.discord.interaction; +package com.discordsrv.api.events.discord.interaction; import com.discordsrv.api.discord.entity.DiscordUser; import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel; diff --git a/api/src/main/java/com/discordsrv/api/event/events/discord/interaction/command/AbstractCommandInteractionEvent.java b/api/src/main/java/com/discordsrv/api/events/discord/interaction/command/AbstractCommandInteractionEvent.java similarity index 94% rename from api/src/main/java/com/discordsrv/api/event/events/discord/interaction/command/AbstractCommandInteractionEvent.java rename to api/src/main/java/com/discordsrv/api/events/discord/interaction/command/AbstractCommandInteractionEvent.java index e9e3a638..99fa8afe 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/discord/interaction/command/AbstractCommandInteractionEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/discord/interaction/command/AbstractCommandInteractionEvent.java @@ -21,7 +21,7 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.discord.interaction.command; +package com.discordsrv.api.events.discord.interaction.command; import com.discordsrv.api.discord.entity.DiscordUser; import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel; @@ -29,7 +29,7 @@ import com.discordsrv.api.discord.entity.guild.DiscordGuildMember; import com.discordsrv.api.discord.entity.interaction.DiscordInteractionHook; import com.discordsrv.api.discord.entity.interaction.component.ComponentIdentifier; import com.discordsrv.api.discord.entity.message.SendableDiscordMessage; -import com.discordsrv.api.event.events.discord.interaction.AbstractDeferrableInteractionEvent; +import com.discordsrv.api.events.discord.interaction.AbstractDeferrableInteractionEvent; import net.dv8tion.jda.api.events.interaction.command.GenericCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/com/discordsrv/api/event/events/discord/interaction/command/CommandRegisterEvent.java b/api/src/main/java/com/discordsrv/api/events/discord/interaction/command/CommandRegisterEvent.java similarity index 95% rename from api/src/main/java/com/discordsrv/api/event/events/discord/interaction/command/CommandRegisterEvent.java rename to api/src/main/java/com/discordsrv/api/events/discord/interaction/command/CommandRegisterEvent.java index 6e9ae37c..be45313f 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/discord/interaction/command/CommandRegisterEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/discord/interaction/command/CommandRegisterEvent.java @@ -21,10 +21,10 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.discord.interaction.command; +package com.discordsrv.api.events.discord.interaction.command; import com.discordsrv.api.discord.entity.interaction.command.DiscordCommand; -import com.discordsrv.api.event.events.Event; +import com.discordsrv.api.events.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Unmodifiable; diff --git a/api/src/main/java/com/discordsrv/api/event/events/discord/interaction/command/DiscordChatInputInteractionEvent.java b/api/src/main/java/com/discordsrv/api/events/discord/interaction/command/DiscordChatInputInteractionEvent.java similarity index 96% rename from api/src/main/java/com/discordsrv/api/event/events/discord/interaction/command/DiscordChatInputInteractionEvent.java rename to api/src/main/java/com/discordsrv/api/events/discord/interaction/command/DiscordChatInputInteractionEvent.java index 381d92d4..1fcdb261 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/discord/interaction/command/DiscordChatInputInteractionEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/discord/interaction/command/DiscordChatInputInteractionEvent.java @@ -21,7 +21,7 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.discord.interaction.command; +package com.discordsrv.api.events.discord.interaction.command; import com.discordsrv.api.discord.entity.DiscordUser; import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel; diff --git a/api/src/main/java/com/discordsrv/api/event/events/discord/interaction/command/DiscordCommandAutoCompleteInteractionEvent.java b/api/src/main/java/com/discordsrv/api/events/discord/interaction/command/DiscordCommandAutoCompleteInteractionEvent.java similarity index 94% rename from api/src/main/java/com/discordsrv/api/event/events/discord/interaction/command/DiscordCommandAutoCompleteInteractionEvent.java rename to api/src/main/java/com/discordsrv/api/events/discord/interaction/command/DiscordCommandAutoCompleteInteractionEvent.java index 605de7f6..25330394 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/discord/interaction/command/DiscordCommandAutoCompleteInteractionEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/discord/interaction/command/DiscordCommandAutoCompleteInteractionEvent.java @@ -21,13 +21,13 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.discord.interaction.command; +package com.discordsrv.api.events.discord.interaction.command; import com.discordsrv.api.discord.entity.DiscordUser; import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel; import com.discordsrv.api.discord.entity.guild.DiscordGuildMember; import com.discordsrv.api.discord.entity.interaction.component.ComponentIdentifier; -import com.discordsrv.api.event.events.discord.interaction.AbstractInteractionEvent; +import com.discordsrv.api.events.discord.interaction.AbstractInteractionEvent; import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; diff --git a/api/src/main/java/com/discordsrv/api/event/events/discord/interaction/command/DiscordMessageContextInteractionEvent.java b/api/src/main/java/com/discordsrv/api/events/discord/interaction/command/DiscordMessageContextInteractionEvent.java similarity index 97% rename from api/src/main/java/com/discordsrv/api/event/events/discord/interaction/command/DiscordMessageContextInteractionEvent.java rename to api/src/main/java/com/discordsrv/api/events/discord/interaction/command/DiscordMessageContextInteractionEvent.java index 768d542b..744e3ffb 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/discord/interaction/command/DiscordMessageContextInteractionEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/discord/interaction/command/DiscordMessageContextInteractionEvent.java @@ -21,7 +21,7 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.discord.interaction.command; +package com.discordsrv.api.events.discord.interaction.command; import com.discordsrv.api.discord.entity.DiscordUser; import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel; diff --git a/api/src/main/java/com/discordsrv/api/event/events/discord/interaction/command/DiscordUserContextInteractionEvent.java b/api/src/main/java/com/discordsrv/api/events/discord/interaction/command/DiscordUserContextInteractionEvent.java similarity index 96% rename from api/src/main/java/com/discordsrv/api/event/events/discord/interaction/command/DiscordUserContextInteractionEvent.java rename to api/src/main/java/com/discordsrv/api/events/discord/interaction/command/DiscordUserContextInteractionEvent.java index fadafec8..1763aa86 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/discord/interaction/command/DiscordUserContextInteractionEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/discord/interaction/command/DiscordUserContextInteractionEvent.java @@ -21,7 +21,7 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.discord.interaction.command; +package com.discordsrv.api.events.discord.interaction.command; import com.discordsrv.api.discord.entity.DiscordUser; import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel; diff --git a/api/src/main/java/com/discordsrv/api/event/events/discord/interaction/component/DiscordButtonInteractionEvent.java b/api/src/main/java/com/discordsrv/api/events/discord/interaction/component/DiscordButtonInteractionEvent.java similarity index 92% rename from api/src/main/java/com/discordsrv/api/event/events/discord/interaction/component/DiscordButtonInteractionEvent.java rename to api/src/main/java/com/discordsrv/api/events/discord/interaction/component/DiscordButtonInteractionEvent.java index 11866c03..ef0cd5ba 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/discord/interaction/component/DiscordButtonInteractionEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/discord/interaction/component/DiscordButtonInteractionEvent.java @@ -21,14 +21,14 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.discord.interaction.component; +package com.discordsrv.api.events.discord.interaction.component; import com.discordsrv.api.discord.entity.DiscordUser; import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel; import com.discordsrv.api.discord.entity.guild.DiscordGuildMember; import com.discordsrv.api.discord.entity.interaction.DiscordInteractionHook; import com.discordsrv.api.discord.entity.interaction.component.ComponentIdentifier; -import com.discordsrv.api.event.events.discord.interaction.AbstractDeferrableInteractionEvent; +import com.discordsrv.api.events.discord.interaction.AbstractDeferrableInteractionEvent; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; public class DiscordButtonInteractionEvent extends AbstractDeferrableInteractionEvent { diff --git a/api/src/main/java/com/discordsrv/api/event/events/discord/interaction/component/DiscordSelectMenuInteractionEvent.java b/api/src/main/java/com/discordsrv/api/events/discord/interaction/component/DiscordSelectMenuInteractionEvent.java similarity index 93% rename from api/src/main/java/com/discordsrv/api/event/events/discord/interaction/component/DiscordSelectMenuInteractionEvent.java rename to api/src/main/java/com/discordsrv/api/events/discord/interaction/component/DiscordSelectMenuInteractionEvent.java index 6d79e4c9..cb66596a 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/discord/interaction/component/DiscordSelectMenuInteractionEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/discord/interaction/component/DiscordSelectMenuInteractionEvent.java @@ -21,14 +21,14 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.discord.interaction.component; +package com.discordsrv.api.events.discord.interaction.component; import com.discordsrv.api.discord.entity.DiscordUser; import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel; import com.discordsrv.api.discord.entity.guild.DiscordGuildMember; import com.discordsrv.api.discord.entity.interaction.DiscordInteractionHook; import com.discordsrv.api.discord.entity.interaction.component.ComponentIdentifier; -import com.discordsrv.api.event.events.discord.interaction.AbstractDeferrableInteractionEvent; +import com.discordsrv.api.events.discord.interaction.AbstractDeferrableInteractionEvent; import net.dv8tion.jda.api.events.interaction.component.GenericSelectMenuInteractionEvent; public class DiscordSelectMenuInteractionEvent extends AbstractDeferrableInteractionEvent> { diff --git a/api/src/main/java/com/discordsrv/api/event/events/discord/member/AbstractDiscordMemberEvent.java b/api/src/main/java/com/discordsrv/api/events/discord/member/AbstractDiscordMemberEvent.java similarity index 93% rename from api/src/main/java/com/discordsrv/api/event/events/discord/member/AbstractDiscordMemberEvent.java rename to api/src/main/java/com/discordsrv/api/events/discord/member/AbstractDiscordMemberEvent.java index 95a64206..2485106e 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/discord/member/AbstractDiscordMemberEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/discord/member/AbstractDiscordMemberEvent.java @@ -21,10 +21,10 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.discord.member; +package com.discordsrv.api.events.discord.member; import com.discordsrv.api.discord.entity.guild.DiscordGuildMember; -import com.discordsrv.api.event.events.discord.AbstractDiscordEvent; +import com.discordsrv.api.events.discord.AbstractDiscordEvent; import net.dv8tion.jda.api.events.guild.member.GenericGuildMemberEvent; public abstract class AbstractDiscordMemberEvent extends AbstractDiscordEvent { diff --git a/api/src/main/java/com/discordsrv/api/event/events/discord/member/role/AbstractDiscordMemberRoleChangeEvent.java b/api/src/main/java/com/discordsrv/api/events/discord/member/role/AbstractDiscordMemberRoleChangeEvent.java similarity index 93% rename from api/src/main/java/com/discordsrv/api/event/events/discord/member/role/AbstractDiscordMemberRoleChangeEvent.java rename to api/src/main/java/com/discordsrv/api/events/discord/member/role/AbstractDiscordMemberRoleChangeEvent.java index d725d19c..4eb9f6f4 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/discord/member/role/AbstractDiscordMemberRoleChangeEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/discord/member/role/AbstractDiscordMemberRoleChangeEvent.java @@ -21,11 +21,11 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.discord.member.role; +package com.discordsrv.api.events.discord.member.role; import com.discordsrv.api.discord.entity.guild.DiscordGuildMember; import com.discordsrv.api.discord.entity.guild.DiscordRole; -import com.discordsrv.api.event.events.discord.member.AbstractDiscordMemberEvent; +import com.discordsrv.api.events.discord.member.AbstractDiscordMemberEvent; import net.dv8tion.jda.api.events.guild.member.GenericGuildMemberEvent; import java.util.List; diff --git a/api/src/main/java/com/discordsrv/api/event/events/discord/member/role/DiscordMemberRoleAddEvent.java b/api/src/main/java/com/discordsrv/api/events/discord/member/role/DiscordMemberRoleAddEvent.java similarity index 96% rename from api/src/main/java/com/discordsrv/api/event/events/discord/member/role/DiscordMemberRoleAddEvent.java rename to api/src/main/java/com/discordsrv/api/events/discord/member/role/DiscordMemberRoleAddEvent.java index bd6b971d..240ff851 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/discord/member/role/DiscordMemberRoleAddEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/discord/member/role/DiscordMemberRoleAddEvent.java @@ -21,7 +21,7 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.discord.member.role; +package com.discordsrv.api.events.discord.member.role; import com.discordsrv.api.discord.entity.guild.DiscordGuildMember; import com.discordsrv.api.discord.entity.guild.DiscordRole; diff --git a/api/src/main/java/com/discordsrv/api/event/events/discord/member/role/DiscordMemberRoleRemoveEvent.java b/api/src/main/java/com/discordsrv/api/events/discord/member/role/DiscordMemberRoleRemoveEvent.java similarity index 96% rename from api/src/main/java/com/discordsrv/api/event/events/discord/member/role/DiscordMemberRoleRemoveEvent.java rename to api/src/main/java/com/discordsrv/api/events/discord/member/role/DiscordMemberRoleRemoveEvent.java index 347e1aeb..b51a2fd4 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/discord/member/role/DiscordMemberRoleRemoveEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/discord/member/role/DiscordMemberRoleRemoveEvent.java @@ -21,7 +21,7 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.discord.member.role; +package com.discordsrv.api.events.discord.member.role; import com.discordsrv.api.discord.entity.guild.DiscordGuildMember; import com.discordsrv.api.discord.entity.guild.DiscordRole; diff --git a/api/src/main/java/com/discordsrv/api/event/events/discord/message/AbstractDiscordMessageEvent.java b/api/src/main/java/com/discordsrv/api/events/discord/message/AbstractDiscordMessageEvent.java similarity index 96% rename from api/src/main/java/com/discordsrv/api/event/events/discord/message/AbstractDiscordMessageEvent.java rename to api/src/main/java/com/discordsrv/api/events/discord/message/AbstractDiscordMessageEvent.java index 080884a3..784773fb 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/discord/message/AbstractDiscordMessageEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/discord/message/AbstractDiscordMessageEvent.java @@ -21,13 +21,13 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.discord.message; +package com.discordsrv.api.events.discord.message; import com.discordsrv.api.discord.entity.channel.DiscordDMChannel; import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel; import com.discordsrv.api.discord.entity.channel.DiscordTextChannel; import com.discordsrv.api.discord.entity.channel.DiscordThreadChannel; -import com.discordsrv.api.event.events.discord.AbstractDiscordEvent; +import com.discordsrv.api.events.discord.AbstractDiscordEvent; import net.dv8tion.jda.api.events.message.GenericMessageEvent; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/com/discordsrv/api/event/events/discord/message/DiscordMessageDeleteEvent.java b/api/src/main/java/com/discordsrv/api/events/discord/message/DiscordMessageDeleteEvent.java similarity index 96% rename from api/src/main/java/com/discordsrv/api/event/events/discord/message/DiscordMessageDeleteEvent.java rename to api/src/main/java/com/discordsrv/api/events/discord/message/DiscordMessageDeleteEvent.java index 36ff218d..6a8d8229 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/discord/message/DiscordMessageDeleteEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/discord/message/DiscordMessageDeleteEvent.java @@ -21,7 +21,7 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.discord.message; +package com.discordsrv.api.events.discord.message; import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel; import net.dv8tion.jda.api.events.message.MessageDeleteEvent; diff --git a/api/src/main/java/com/discordsrv/api/event/events/discord/message/DiscordMessageReceiveEvent.java b/api/src/main/java/com/discordsrv/api/events/discord/message/DiscordMessageReceiveEvent.java similarity index 97% rename from api/src/main/java/com/discordsrv/api/event/events/discord/message/DiscordMessageReceiveEvent.java rename to api/src/main/java/com/discordsrv/api/events/discord/message/DiscordMessageReceiveEvent.java index 3a064aea..372ca16f 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/discord/message/DiscordMessageReceiveEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/discord/message/DiscordMessageReceiveEvent.java @@ -21,7 +21,7 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.discord.message; +package com.discordsrv.api.events.discord.message; import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel; import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessage; diff --git a/api/src/main/java/com/discordsrv/api/event/events/discord/message/DiscordMessageUpdateEvent.java b/api/src/main/java/com/discordsrv/api/events/discord/message/DiscordMessageUpdateEvent.java similarity index 97% rename from api/src/main/java/com/discordsrv/api/event/events/discord/message/DiscordMessageUpdateEvent.java rename to api/src/main/java/com/discordsrv/api/events/discord/message/DiscordMessageUpdateEvent.java index 2cb24041..23ad3950 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/discord/message/DiscordMessageUpdateEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/discord/message/DiscordMessageUpdateEvent.java @@ -21,7 +21,7 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.discord.message; +package com.discordsrv.api.events.discord.message; import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel; import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessage; diff --git a/api/src/main/java/com/discordsrv/api/event/events/lifecycle/DiscordSRVConnectedEvent.java b/api/src/main/java/com/discordsrv/api/events/lifecycle/DiscordSRVConnectedEvent.java similarity index 93% rename from api/src/main/java/com/discordsrv/api/event/events/lifecycle/DiscordSRVConnectedEvent.java rename to api/src/main/java/com/discordsrv/api/events/lifecycle/DiscordSRVConnectedEvent.java index 8df620f0..8a19eb12 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/lifecycle/DiscordSRVConnectedEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/lifecycle/DiscordSRVConnectedEvent.java @@ -21,9 +21,9 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.lifecycle; +package com.discordsrv.api.events.lifecycle; -import com.discordsrv.api.event.events.Event; +import com.discordsrv.api.events.Event; /** * Indicates that DiscordSRV's Discord connection has been (re-)established. This may run more than once. diff --git a/api/src/main/java/com/discordsrv/api/event/events/lifecycle/DiscordSRVReadyEvent.java b/api/src/main/java/com/discordsrv/api/events/lifecycle/DiscordSRVReadyEvent.java similarity index 93% rename from api/src/main/java/com/discordsrv/api/event/events/lifecycle/DiscordSRVReadyEvent.java rename to api/src/main/java/com/discordsrv/api/events/lifecycle/DiscordSRVReadyEvent.java index 36a4fc84..1e3824ba 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/lifecycle/DiscordSRVReadyEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/lifecycle/DiscordSRVReadyEvent.java @@ -21,9 +21,9 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.lifecycle; +package com.discordsrv.api.events.lifecycle; -import com.discordsrv.api.event.events.Event; +import com.discordsrv.api.events.Event; /** * Indicates that DiscordSRV is ready (including Discord connection), this only runs once when DiscordSRV enables. diff --git a/api/src/main/java/com/discordsrv/api/event/events/lifecycle/DiscordSRVReloadedEvent.java b/api/src/main/java/com/discordsrv/api/events/lifecycle/DiscordSRVReloadedEvent.java similarity index 95% rename from api/src/main/java/com/discordsrv/api/event/events/lifecycle/DiscordSRVReloadedEvent.java rename to api/src/main/java/com/discordsrv/api/events/lifecycle/DiscordSRVReloadedEvent.java index f4e4a848..681b9fe0 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/lifecycle/DiscordSRVReloadedEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/lifecycle/DiscordSRVReloadedEvent.java @@ -21,10 +21,10 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.lifecycle; +package com.discordsrv.api.events.lifecycle; import com.discordsrv.api.DiscordSRVApi; -import com.discordsrv.api.event.events.Event; +import com.discordsrv.api.events.Event; import java.util.Set; diff --git a/api/src/main/java/com/discordsrv/api/event/events/lifecycle/DiscordSRVShuttingDownEvent.java b/api/src/main/java/com/discordsrv/api/events/lifecycle/DiscordSRVShuttingDownEvent.java similarity index 91% rename from api/src/main/java/com/discordsrv/api/event/events/lifecycle/DiscordSRVShuttingDownEvent.java rename to api/src/main/java/com/discordsrv/api/events/lifecycle/DiscordSRVShuttingDownEvent.java index c3492d2c..a9885e3b 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/lifecycle/DiscordSRVShuttingDownEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/lifecycle/DiscordSRVShuttingDownEvent.java @@ -21,10 +21,10 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.lifecycle; +package com.discordsrv.api.events.lifecycle; -import com.discordsrv.api.event.bus.EventPriority; -import com.discordsrv.api.event.events.Event; +import com.discordsrv.api.eventbus.EventPriority; +import com.discordsrv.api.events.Event; /** * Indicates that DiscordSRV is shutting down. diff --git a/api/src/main/java/com/discordsrv/api/event/events/linking/AccountLinkedEvent.java b/api/src/main/java/com/discordsrv/api/events/linking/AccountLinkedEvent.java similarity index 96% rename from api/src/main/java/com/discordsrv/api/event/events/linking/AccountLinkedEvent.java rename to api/src/main/java/com/discordsrv/api/events/linking/AccountLinkedEvent.java index 18ee5a4c..3c04ec74 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/linking/AccountLinkedEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/linking/AccountLinkedEvent.java @@ -21,9 +21,9 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.linking; +package com.discordsrv.api.events.linking; -import com.discordsrv.api.event.events.Event; +import com.discordsrv.api.events.Event; import com.discordsrv.api.profile.IProfile; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/com/discordsrv/api/event/events/linking/AccountUnlinkedEvent.java b/api/src/main/java/com/discordsrv/api/events/linking/AccountUnlinkedEvent.java similarity index 95% rename from api/src/main/java/com/discordsrv/api/event/events/linking/AccountUnlinkedEvent.java rename to api/src/main/java/com/discordsrv/api/events/linking/AccountUnlinkedEvent.java index 064acb3d..b3f4dadf 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/linking/AccountUnlinkedEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/linking/AccountUnlinkedEvent.java @@ -21,9 +21,9 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.linking; +package com.discordsrv.api.events.linking; -import com.discordsrv.api.event.events.Event; +import com.discordsrv.api.events.Event; import org.jetbrains.annotations.NotNull; import java.util.UUID; diff --git a/api/src/main/java/com/discordsrv/api/event/events/message/forward/discord/DiscordChatMessageForwardedEvent.java b/api/src/main/java/com/discordsrv/api/events/message/forward/discord/DiscordChatMessageForwardedEvent.java similarity index 94% rename from api/src/main/java/com/discordsrv/api/event/events/message/forward/discord/DiscordChatMessageForwardedEvent.java rename to api/src/main/java/com/discordsrv/api/events/message/forward/discord/DiscordChatMessageForwardedEvent.java index 2257ebe1..cf801271 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/message/forward/discord/DiscordChatMessageForwardedEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/message/forward/discord/DiscordChatMessageForwardedEvent.java @@ -21,11 +21,11 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.message.forward.discord; +package com.discordsrv.api.events.message.forward.discord; import com.discordsrv.api.channel.GameChannel; import com.discordsrv.api.component.MinecraftComponent; -import com.discordsrv.api.event.events.Event; +import com.discordsrv.api.events.Event; import org.jetbrains.annotations.NotNull; /** diff --git a/api/src/main/java/com/discordsrv/api/event/events/message/forward/game/AbstractGameMessageForwardedEvent.java b/api/src/main/java/com/discordsrv/api/events/message/forward/game/AbstractGameMessageForwardedEvent.java similarity index 95% rename from api/src/main/java/com/discordsrv/api/event/events/message/forward/game/AbstractGameMessageForwardedEvent.java rename to api/src/main/java/com/discordsrv/api/events/message/forward/game/AbstractGameMessageForwardedEvent.java index 6bdddbc7..3a3cbcf1 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/message/forward/game/AbstractGameMessageForwardedEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/message/forward/game/AbstractGameMessageForwardedEvent.java @@ -21,11 +21,11 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.message.forward.game; +package com.discordsrv.api.events.message.forward.game; import com.discordsrv.api.channel.GameChannel; import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster; -import com.discordsrv.api.event.events.Event; +import com.discordsrv.api.events.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/com/discordsrv/api/event/events/message/forward/game/AwardMessageForwardedEvent.java b/api/src/main/java/com/discordsrv/api/events/message/forward/game/AwardMessageForwardedEvent.java similarity index 96% rename from api/src/main/java/com/discordsrv/api/event/events/message/forward/game/AwardMessageForwardedEvent.java rename to api/src/main/java/com/discordsrv/api/events/message/forward/game/AwardMessageForwardedEvent.java index dcf94692..dd5a2d3c 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/message/forward/game/AwardMessageForwardedEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/message/forward/game/AwardMessageForwardedEvent.java @@ -21,7 +21,7 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.message.forward.game; +package com.discordsrv.api.events.message.forward.game; import com.discordsrv.api.channel.GameChannel; import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster; diff --git a/api/src/main/java/com/discordsrv/api/event/events/message/forward/game/DeathMessageForwardedEvent.java b/api/src/main/java/com/discordsrv/api/events/message/forward/game/DeathMessageForwardedEvent.java similarity index 96% rename from api/src/main/java/com/discordsrv/api/event/events/message/forward/game/DeathMessageForwardedEvent.java rename to api/src/main/java/com/discordsrv/api/events/message/forward/game/DeathMessageForwardedEvent.java index 86ef0969..f50eea0d 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/message/forward/game/DeathMessageForwardedEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/message/forward/game/DeathMessageForwardedEvent.java @@ -21,7 +21,7 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.message.forward.game; +package com.discordsrv.api.events.message.forward.game; import com.discordsrv.api.channel.GameChannel; import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster; diff --git a/api/src/main/java/com/discordsrv/api/event/events/message/forward/game/GameChatMessageForwardedEvent.java b/api/src/main/java/com/discordsrv/api/events/message/forward/game/GameChatMessageForwardedEvent.java similarity index 96% rename from api/src/main/java/com/discordsrv/api/event/events/message/forward/game/GameChatMessageForwardedEvent.java rename to api/src/main/java/com/discordsrv/api/events/message/forward/game/GameChatMessageForwardedEvent.java index dcd31c38..ffead415 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/message/forward/game/GameChatMessageForwardedEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/message/forward/game/GameChatMessageForwardedEvent.java @@ -21,7 +21,7 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.message.forward.game; +package com.discordsrv.api.events.message.forward.game; import com.discordsrv.api.channel.GameChannel; import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster; diff --git a/api/src/main/java/com/discordsrv/api/event/events/message/forward/game/JoinMessageForwardedEvent.java b/api/src/main/java/com/discordsrv/api/events/message/forward/game/JoinMessageForwardedEvent.java similarity index 96% rename from api/src/main/java/com/discordsrv/api/event/events/message/forward/game/JoinMessageForwardedEvent.java rename to api/src/main/java/com/discordsrv/api/events/message/forward/game/JoinMessageForwardedEvent.java index f1749541..3eefc53e 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/message/forward/game/JoinMessageForwardedEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/message/forward/game/JoinMessageForwardedEvent.java @@ -21,7 +21,7 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.message.forward.game; +package com.discordsrv.api.events.message.forward.game; import com.discordsrv.api.channel.GameChannel; import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster; diff --git a/api/src/main/java/com/discordsrv/api/event/events/message/forward/game/LeaveMessageForwardedEvent.java b/api/src/main/java/com/discordsrv/api/events/message/forward/game/LeaveMessageForwardedEvent.java similarity index 96% rename from api/src/main/java/com/discordsrv/api/event/events/message/forward/game/LeaveMessageForwardedEvent.java rename to api/src/main/java/com/discordsrv/api/events/message/forward/game/LeaveMessageForwardedEvent.java index 247dbda9..da8fbc0c 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/message/forward/game/LeaveMessageForwardedEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/message/forward/game/LeaveMessageForwardedEvent.java @@ -21,7 +21,7 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.message.forward.game; +package com.discordsrv.api.events.message.forward.game; import com.discordsrv.api.channel.GameChannel; import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster; diff --git a/api/src/main/java/com/discordsrv/api/event/events/message/forward/game/ServerSwitchMessageForwardedEvent.java b/api/src/main/java/com/discordsrv/api/events/message/forward/game/ServerSwitchMessageForwardedEvent.java similarity index 96% rename from api/src/main/java/com/discordsrv/api/event/events/message/forward/game/ServerSwitchMessageForwardedEvent.java rename to api/src/main/java/com/discordsrv/api/events/message/forward/game/ServerSwitchMessageForwardedEvent.java index e1bd3610..7e9b56d0 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/message/forward/game/ServerSwitchMessageForwardedEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/message/forward/game/ServerSwitchMessageForwardedEvent.java @@ -21,7 +21,7 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.message.forward.game; +package com.discordsrv.api.events.message.forward.game; import com.discordsrv.api.channel.GameChannel; import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster; diff --git a/api/src/main/java/com/discordsrv/api/event/events/message/process/discord/DiscordChatMessageCustomEmojiRenderEvent.java b/api/src/main/java/com/discordsrv/api/events/message/process/discord/DiscordChatMessageCustomEmojiRenderEvent.java similarity index 94% rename from api/src/main/java/com/discordsrv/api/event/events/message/process/discord/DiscordChatMessageCustomEmojiRenderEvent.java rename to api/src/main/java/com/discordsrv/api/events/message/process/discord/DiscordChatMessageCustomEmojiRenderEvent.java index 5396b78f..1465e058 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/message/process/discord/DiscordChatMessageCustomEmojiRenderEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/message/process/discord/DiscordChatMessageCustomEmojiRenderEvent.java @@ -21,12 +21,12 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.message.process.discord; +package com.discordsrv.api.events.message.process.discord; import com.discordsrv.api.component.MinecraftComponent; import com.discordsrv.api.discord.entity.guild.DiscordCustomEmoji; -import com.discordsrv.api.event.events.Event; -import com.discordsrv.api.event.events.Processable; +import com.discordsrv.api.events.Event; +import com.discordsrv.api.events.Processable; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/com/discordsrv/api/event/events/message/process/discord/DiscordChatMessageProcessEvent.java b/api/src/main/java/com/discordsrv/api/events/message/process/discord/DiscordChatMessageProcessEvent.java similarity index 92% rename from api/src/main/java/com/discordsrv/api/event/events/message/process/discord/DiscordChatMessageProcessEvent.java rename to api/src/main/java/com/discordsrv/api/events/message/process/discord/DiscordChatMessageProcessEvent.java index 8c8af692..77f96fbf 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/message/process/discord/DiscordChatMessageProcessEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/message/process/discord/DiscordChatMessageProcessEvent.java @@ -21,14 +21,14 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.message.process.discord; +package com.discordsrv.api.events.message.process.discord; import com.discordsrv.api.channel.GameChannel; import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel; import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessage; -import com.discordsrv.api.event.events.Cancellable; -import com.discordsrv.api.event.events.Processable; -import com.discordsrv.api.event.events.message.receive.discord.DiscordChatMessageReceiveEvent; +import com.discordsrv.api.events.Cancellable; +import com.discordsrv.api.events.Processable; +import com.discordsrv.api.events.message.receive.discord.DiscordChatMessageReceiveEvent; /** * Indicates that a Discord message is about to be processed, this will run once per {@link GameChannel} destination, diff --git a/api/src/main/java/com/discordsrv/api/event/events/message/receive/discord/DiscordChatMessageReceiveEvent.java b/api/src/main/java/com/discordsrv/api/events/message/receive/discord/DiscordChatMessageReceiveEvent.java similarity index 93% rename from api/src/main/java/com/discordsrv/api/event/events/message/receive/discord/DiscordChatMessageReceiveEvent.java rename to api/src/main/java/com/discordsrv/api/events/message/receive/discord/DiscordChatMessageReceiveEvent.java index 5e56513e..84ba8128 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/message/receive/discord/DiscordChatMessageReceiveEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/message/receive/discord/DiscordChatMessageReceiveEvent.java @@ -21,15 +21,15 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.message.receive.discord; +package com.discordsrv.api.events.message.receive.discord; import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel; import com.discordsrv.api.discord.entity.channel.DiscordTextChannel; import com.discordsrv.api.discord.entity.channel.DiscordThreadChannel; import com.discordsrv.api.discord.entity.guild.DiscordGuild; import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessage; -import com.discordsrv.api.event.events.Cancellable; -import com.discordsrv.api.event.events.message.process.discord.DiscordChatMessageProcessEvent; +import com.discordsrv.api.events.Cancellable; +import com.discordsrv.api.events.message.process.discord.DiscordChatMessageProcessEvent; import org.jetbrains.annotations.NotNull; /** diff --git a/api/src/main/java/com/discordsrv/api/event/events/message/receive/game/AbstractGameMessageReceiveEvent.java b/api/src/main/java/com/discordsrv/api/events/message/receive/game/AbstractGameMessageReceiveEvent.java similarity index 93% rename from api/src/main/java/com/discordsrv/api/event/events/message/receive/game/AbstractGameMessageReceiveEvent.java rename to api/src/main/java/com/discordsrv/api/events/message/receive/game/AbstractGameMessageReceiveEvent.java index c4752d9a..6299703e 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/message/receive/game/AbstractGameMessageReceiveEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/message/receive/game/AbstractGameMessageReceiveEvent.java @@ -21,10 +21,10 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.message.receive.game; +package com.discordsrv.api.events.message.receive.game; -import com.discordsrv.api.event.events.Cancellable; -import com.discordsrv.api.event.events.Processable; +import com.discordsrv.api.events.Cancellable; +import com.discordsrv.api.events.Processable; import org.jetbrains.annotations.Nullable; public abstract class AbstractGameMessageReceiveEvent implements Cancellable, Processable.NoArgument { diff --git a/api/src/main/java/com/discordsrv/api/event/events/message/receive/game/AwardMessageReceiveEvent.java b/api/src/main/java/com/discordsrv/api/events/message/receive/game/AwardMessageReceiveEvent.java similarity index 93% rename from api/src/main/java/com/discordsrv/api/event/events/message/receive/game/AwardMessageReceiveEvent.java rename to api/src/main/java/com/discordsrv/api/events/message/receive/game/AwardMessageReceiveEvent.java index 5b6e17f1..c858531d 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/message/receive/game/AwardMessageReceiveEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/message/receive/game/AwardMessageReceiveEvent.java @@ -21,17 +21,18 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.message.receive.game; +package com.discordsrv.api.events.message.receive.game; import com.discordsrv.api.channel.GameChannel; import com.discordsrv.api.component.MinecraftComponent; +import com.discordsrv.api.eventbus.EventPriority; import com.discordsrv.api.player.DiscordSRVPlayer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** * Indicates that an advancement or achievement message was received will be processed - * at {@link com.discordsrv.api.event.bus.EventPriority#DEFAULT} unless cancelled or processed by a 3rd party. + * at {@link EventPriority#DEFAULT} unless cancelled or processed by a 3rd party. */ public class AwardMessageReceiveEvent extends AbstractGameMessageReceiveEvent { diff --git a/api/src/main/java/com/discordsrv/api/event/events/message/receive/game/DeathMessageReceiveEvent.java b/api/src/main/java/com/discordsrv/api/events/message/receive/game/DeathMessageReceiveEvent.java similarity index 93% rename from api/src/main/java/com/discordsrv/api/event/events/message/receive/game/DeathMessageReceiveEvent.java rename to api/src/main/java/com/discordsrv/api/events/message/receive/game/DeathMessageReceiveEvent.java index 95d3addf..a774cd58 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/message/receive/game/DeathMessageReceiveEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/message/receive/game/DeathMessageReceiveEvent.java @@ -21,17 +21,18 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.message.receive.game; +package com.discordsrv.api.events.message.receive.game; import com.discordsrv.api.channel.GameChannel; import com.discordsrv.api.component.MinecraftComponent; +import com.discordsrv.api.eventbus.EventPriority; import com.discordsrv.api.player.DiscordSRVPlayer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** * Indicates that a death message was received and will be processed - * at {@link com.discordsrv.api.event.bus.EventPriority#DEFAULT} unless cancelled or processed by a 3rd party. + * at {@link EventPriority#DEFAULT} unless cancelled or processed by a 3rd party. */ public class DeathMessageReceiveEvent extends AbstractGameMessageReceiveEvent { diff --git a/api/src/main/java/com/discordsrv/api/event/events/message/receive/game/GameChatMessageReceiveEvent.java b/api/src/main/java/com/discordsrv/api/events/message/receive/game/GameChatMessageReceiveEvent.java similarity index 92% rename from api/src/main/java/com/discordsrv/api/event/events/message/receive/game/GameChatMessageReceiveEvent.java rename to api/src/main/java/com/discordsrv/api/events/message/receive/game/GameChatMessageReceiveEvent.java index d4849b20..f5266848 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/message/receive/game/GameChatMessageReceiveEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/message/receive/game/GameChatMessageReceiveEvent.java @@ -21,18 +21,19 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.message.receive.game; +package com.discordsrv.api.events.message.receive.game; import com.discordsrv.api.channel.GameChannel; import com.discordsrv.api.component.MinecraftComponent; -import com.discordsrv.api.event.events.PlayerEvent; +import com.discordsrv.api.eventbus.EventPriority; +import com.discordsrv.api.events.PlayerEvent; import com.discordsrv.api.player.DiscordSRVPlayer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** * Indicates that a chat message was received and will be processed - * at {@link com.discordsrv.api.event.bus.EventPriority#DEFAULT} unless cancelled or processed by a 3rd party. + * at {@link EventPriority#DEFAULT} unless cancelled or processed by a 3rd party. */ public class GameChatMessageReceiveEvent extends AbstractGameMessageReceiveEvent implements PlayerEvent { diff --git a/api/src/main/java/com/discordsrv/api/event/events/message/receive/game/JoinMessageReceiveEvent.java b/api/src/main/java/com/discordsrv/api/events/message/receive/game/JoinMessageReceiveEvent.java similarity index 93% rename from api/src/main/java/com/discordsrv/api/event/events/message/receive/game/JoinMessageReceiveEvent.java rename to api/src/main/java/com/discordsrv/api/events/message/receive/game/JoinMessageReceiveEvent.java index ab318715..9b9c429d 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/message/receive/game/JoinMessageReceiveEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/message/receive/game/JoinMessageReceiveEvent.java @@ -21,17 +21,18 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.message.receive.game; +package com.discordsrv.api.events.message.receive.game; import com.discordsrv.api.channel.GameChannel; import com.discordsrv.api.component.MinecraftComponent; +import com.discordsrv.api.eventbus.EventPriority; import com.discordsrv.api.player.DiscordSRVPlayer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** * Indicates that a join message was received and will be processed - * at {@link com.discordsrv.api.event.bus.EventPriority#DEFAULT} unless cancelled or processed by a 3rd party. + * at {@link EventPriority#DEFAULT} unless cancelled or processed by a 3rd party. */ public class JoinMessageReceiveEvent extends AbstractGameMessageReceiveEvent { diff --git a/api/src/main/java/com/discordsrv/api/event/events/message/receive/game/LeaveMessageReceiveEvent.java b/api/src/main/java/com/discordsrv/api/events/message/receive/game/LeaveMessageReceiveEvent.java similarity index 93% rename from api/src/main/java/com/discordsrv/api/event/events/message/receive/game/LeaveMessageReceiveEvent.java rename to api/src/main/java/com/discordsrv/api/events/message/receive/game/LeaveMessageReceiveEvent.java index 20948a4c..99f8e3df 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/message/receive/game/LeaveMessageReceiveEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/message/receive/game/LeaveMessageReceiveEvent.java @@ -21,17 +21,18 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.message.receive.game; +package com.discordsrv.api.events.message.receive.game; import com.discordsrv.api.channel.GameChannel; import com.discordsrv.api.component.MinecraftComponent; +import com.discordsrv.api.eventbus.EventPriority; import com.discordsrv.api.player.DiscordSRVPlayer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** * Indicates that a leave message was received and will be processed - * at {@link com.discordsrv.api.event.bus.EventPriority#DEFAULT} unless cancelled or processed by a 3rd party. + * at {@link EventPriority#DEFAULT} unless cancelled or processed by a 3rd party. */ public class LeaveMessageReceiveEvent extends AbstractGameMessageReceiveEvent { diff --git a/api/src/main/java/com/discordsrv/api/event/events/message/receive/game/ServerSwitchMessageReceiveEvent.java b/api/src/main/java/com/discordsrv/api/events/message/receive/game/ServerSwitchMessageReceiveEvent.java similarity index 92% rename from api/src/main/java/com/discordsrv/api/event/events/message/receive/game/ServerSwitchMessageReceiveEvent.java rename to api/src/main/java/com/discordsrv/api/events/message/receive/game/ServerSwitchMessageReceiveEvent.java index a837a9ba..31346d10 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/message/receive/game/ServerSwitchMessageReceiveEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/message/receive/game/ServerSwitchMessageReceiveEvent.java @@ -21,16 +21,17 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.message.receive.game; +package com.discordsrv.api.events.message.receive.game; import com.discordsrv.api.component.MinecraftComponent; +import com.discordsrv.api.eventbus.EventPriority; import com.discordsrv.api.player.DiscordSRVPlayer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** * Indicates that a server switch message was received and will be processed - * at {@link com.discordsrv.api.event.bus.EventPriority#DEFAULT} unless cancelled or processed by a 3rd party. + * at {@link EventPriority#DEFAULT} unless cancelled or processed by a 3rd party. */ public class ServerSwitchMessageReceiveEvent extends AbstractGameMessageReceiveEvent { diff --git a/api/src/main/java/com/discordsrv/api/event/events/placeholder/PlaceholderLookupEvent.java b/api/src/main/java/com/discordsrv/api/events/placeholder/PlaceholderLookupEvent.java similarity index 96% rename from api/src/main/java/com/discordsrv/api/event/events/placeholder/PlaceholderLookupEvent.java rename to api/src/main/java/com/discordsrv/api/events/placeholder/PlaceholderLookupEvent.java index 8c14bdd2..b14a1fa2 100644 --- a/api/src/main/java/com/discordsrv/api/event/events/placeholder/PlaceholderLookupEvent.java +++ b/api/src/main/java/com/discordsrv/api/events/placeholder/PlaceholderLookupEvent.java @@ -21,10 +21,10 @@ * SOFTWARE. */ -package com.discordsrv.api.event.events.placeholder; +package com.discordsrv.api.events.placeholder; -import com.discordsrv.api.event.events.Event; -import com.discordsrv.api.event.events.Processable; +import com.discordsrv.api.events.Event; +import com.discordsrv.api.events.Processable; import com.discordsrv.api.placeholder.PlaceholderLookupResult; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/com/discordsrv/api/module/Module.java b/api/src/main/java/com/discordsrv/api/module/Module.java index 15e85469..433d3add 100644 --- a/api/src/main/java/com/discordsrv/api/module/Module.java +++ b/api/src/main/java/com/discordsrv/api/module/Module.java @@ -27,8 +27,9 @@ import com.discordsrv.api.DiscordSRVApi; import com.discordsrv.api.discord.connection.details.DiscordCacheFlag; import com.discordsrv.api.discord.connection.details.DiscordGatewayIntent; import com.discordsrv.api.discord.connection.details.DiscordMemberCachePolicy; -import com.discordsrv.api.event.bus.EventListener; -import com.discordsrv.api.event.events.discord.message.AbstractDiscordMessageEvent; +import com.discordsrv.api.eventbus.EventListener; +import com.discordsrv.api.eventbus.Subscribe; +import com.discordsrv.api.events.discord.message.AbstractDiscordMessageEvent; import net.dv8tion.jda.api.events.GenericEvent; import net.dv8tion.jda.api.events.guild.member.GenericGuildMemberEvent; import net.dv8tion.jda.api.requests.GatewayIntent; @@ -60,7 +61,7 @@ public interface Module { /** * Provides a {@link Collection} of {@link DiscordGatewayIntent}s that are required for this {@link Module}. - * This defaults to determining intents based on the events listened to in this class via {@link com.discordsrv.api.event.bus.Subscribe} methods. + * This defaults to determining intents based on the events listened to in this class via {@link Subscribe} methods. * @return the collection of gateway intents required by this module at the time this method is called */ @SuppressWarnings("unchecked") // Class generic cast diff --git a/api/src/main/java/com/discordsrv/api/placeholder/provider/PlaceholderProvider.java b/api/src/main/java/com/discordsrv/api/placeholder/provider/PlaceholderProvider.java index 0e0c8c34..9328818a 100644 --- a/api/src/main/java/com/discordsrv/api/placeholder/provider/PlaceholderProvider.java +++ b/api/src/main/java/com/discordsrv/api/placeholder/provider/PlaceholderProvider.java @@ -23,6 +23,7 @@ package com.discordsrv.api.placeholder.provider; +import com.discordsrv.api.events.placeholder.PlaceholderLookupEvent; import com.discordsrv.api.placeholder.PlaceholderLookupResult; import com.discordsrv.api.placeholder.annotation.Placeholder; import org.jetbrains.annotations.NotNull; @@ -31,7 +32,7 @@ import java.util.Set; /** * A placeholder provider used internally by DiscordSRV for {@link Placeholder}. - * API users should use the {@link com.discordsrv.api.event.events.placeholder.PlaceholderLookupEvent} instead. + * API users should use the {@link PlaceholderLookupEvent} instead. */ public interface PlaceholderProvider { diff --git a/bukkit/bukkit1_12/src/main/java/com/discordsrv/bukkit/listener/award/AbstractBukkitAwardListener.java b/bukkit/bukkit1_12/src/main/java/com/discordsrv/bukkit/listener/award/AbstractBukkitAwardListener.java index 4819cb4e..317fb286 100644 --- a/bukkit/bukkit1_12/src/main/java/com/discordsrv/bukkit/listener/award/AbstractBukkitAwardListener.java +++ b/bukkit/bukkit1_12/src/main/java/com/discordsrv/bukkit/listener/award/AbstractBukkitAwardListener.java @@ -19,8 +19,8 @@ package com.discordsrv.bukkit.listener.award; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.logging.Logger; -import com.discordsrv.common.logging.NamedLogger; +import com.discordsrv.common.core.logging.Logger; +import com.discordsrv.common.core.logging.NamedLogger; import org.bukkit.event.Listener; public abstract class AbstractBukkitAwardListener implements Listener { diff --git a/bukkit/bukkit1_12/src/main/java/com/discordsrv/bukkit/listener/award/BukkitLegacyAdvancementListener.java b/bukkit/bukkit1_12/src/main/java/com/discordsrv/bukkit/listener/award/BukkitLegacyAdvancementListener.java index 68d55b84..facf4644 100644 --- a/bukkit/bukkit1_12/src/main/java/com/discordsrv/bukkit/listener/award/BukkitLegacyAdvancementListener.java +++ b/bukkit/bukkit1_12/src/main/java/com/discordsrv/bukkit/listener/award/BukkitLegacyAdvancementListener.java @@ -19,7 +19,7 @@ package com.discordsrv.bukkit.listener.award; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.component.util.ComponentUtil; +import com.discordsrv.common.util.ComponentUtil; import net.kyori.adventure.platform.bukkit.BukkitComponentSerializer; import org.bukkit.Bukkit; import org.bukkit.advancement.Advancement; diff --git a/bukkit/folia/src/main/java/com/discordsrv/bukkit/scheduler/IBukkitScheduler.java b/bukkit/folia/src/main/java/com/discordsrv/bukkit/scheduler/IBukkitScheduler.java index 6e33d07a..3fae8dcb 100644 --- a/bukkit/folia/src/main/java/com/discordsrv/bukkit/scheduler/IBukkitScheduler.java +++ b/bukkit/folia/src/main/java/com/discordsrv/bukkit/scheduler/IBukkitScheduler.java @@ -18,9 +18,9 @@ package com.discordsrv.bukkit.scheduler; -import com.discordsrv.common.function.CheckedSupplier; -import com.discordsrv.common.future.util.CompletableFutureUtil; -import com.discordsrv.common.scheduler.ServerScheduler; +import com.discordsrv.common.core.scheduler.ServerScheduler; +import com.discordsrv.common.util.CompletableFutureUtil; +import com.discordsrv.common.util.function.CheckedSupplier; import org.bukkit.Server; import org.bukkit.command.CommandSender; import org.bukkit.plugin.Plugin; diff --git a/bukkit/folia/src/main/java/com/discordsrv/bukkit/scheduler/IFoliaScheduler.java b/bukkit/folia/src/main/java/com/discordsrv/bukkit/scheduler/IFoliaScheduler.java index 4a9fdb4b..722364ba 100644 --- a/bukkit/folia/src/main/java/com/discordsrv/bukkit/scheduler/IFoliaScheduler.java +++ b/bukkit/folia/src/main/java/com/discordsrv/bukkit/scheduler/IFoliaScheduler.java @@ -18,7 +18,7 @@ package com.discordsrv.bukkit.scheduler; -import com.discordsrv.common.scheduler.ServerScheduler; +import com.discordsrv.common.core.scheduler.ServerScheduler; import org.bukkit.command.BlockCommandSender; import org.bukkit.command.CommandSender; import org.bukkit.command.ProxiedCommandSender; diff --git a/bukkit/paper/src/main/java/com/discordsrv/bukkit/component/PaperComponentHandle.java b/bukkit/paper/src/main/java/com/discordsrv/bukkit/component/PaperComponentHandle.java index 243b0fc1..eabccc17 100644 --- a/bukkit/paper/src/main/java/com/discordsrv/bukkit/component/PaperComponentHandle.java +++ b/bukkit/paper/src/main/java/com/discordsrv/bukkit/component/PaperComponentHandle.java @@ -19,8 +19,8 @@ package com.discordsrv.bukkit.component; import com.discordsrv.api.component.MinecraftComponent; -import com.discordsrv.common.component.ComponentFactory; -import com.discordsrv.common.component.util.ComponentUtil; +import com.discordsrv.common.core.component.ComponentFactory; +import com.discordsrv.common.util.ComponentUtil; import net.kyori.adventure.platform.bukkit.BukkitComponentSerializer; import java.lang.invoke.MethodHandle; diff --git a/bukkit/paper/src/main/java/com/discordsrv/bukkit/player/PaperPlayer.java b/bukkit/paper/src/main/java/com/discordsrv/bukkit/player/PaperPlayer.java index a33bb496..b0c2bf7e 100644 --- a/bukkit/paper/src/main/java/com/discordsrv/bukkit/player/PaperPlayer.java +++ b/bukkit/paper/src/main/java/com/discordsrv/bukkit/player/PaperPlayer.java @@ -18,7 +18,7 @@ package com.discordsrv.bukkit.player; -import com.discordsrv.common.component.util.ComponentUtil; +import com.discordsrv.common.util.ComponentUtil; import net.kyori.adventure.text.Component; import org.bukkit.entity.Player; diff --git a/bukkit/spigot/src/main/java/com/discordsrv/bukkit/listener/award/SpigotModernAdvancementListener.java b/bukkit/spigot/src/main/java/com/discordsrv/bukkit/listener/award/SpigotModernAdvancementListener.java index 04118d21..930eb201 100644 --- a/bukkit/spigot/src/main/java/com/discordsrv/bukkit/listener/award/SpigotModernAdvancementListener.java +++ b/bukkit/spigot/src/main/java/com/discordsrv/bukkit/listener/award/SpigotModernAdvancementListener.java @@ -20,7 +20,7 @@ package com.discordsrv.bukkit.listener.award; import com.discordsrv.api.component.MinecraftComponent; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.component.util.ComponentUtil; +import com.discordsrv.common.util.ComponentUtil; import net.kyori.adventure.platform.bukkit.BukkitComponentSerializer; import org.bukkit.advancement.Advancement; import org.bukkit.advancement.AdvancementDisplay; diff --git a/bukkit/spigot/src/main/java/com/discordsrv/bukkit/player/SpigotPlayer.java b/bukkit/spigot/src/main/java/com/discordsrv/bukkit/player/SpigotPlayer.java index 1acea94f..b613b50f 100644 --- a/bukkit/spigot/src/main/java/com/discordsrv/bukkit/player/SpigotPlayer.java +++ b/bukkit/spigot/src/main/java/com/discordsrv/bukkit/player/SpigotPlayer.java @@ -18,7 +18,7 @@ package com.discordsrv.bukkit.player; -import com.discordsrv.common.player.provider.model.SkinInfo; +import com.discordsrv.common.abstraction.player.provider.model.SkinInfo; import org.bukkit.entity.Player; import org.bukkit.profile.PlayerTextures; diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/BukkitDiscordSRV.java b/bukkit/src/main/java/com/discordsrv/bukkit/BukkitDiscordSRV.java index 72a473fb..09f41643 100644 --- a/bukkit/src/main/java/com/discordsrv/bukkit/BukkitDiscordSRV.java +++ b/bukkit/src/main/java/com/discordsrv/bukkit/BukkitDiscordSRV.java @@ -41,14 +41,14 @@ import com.discordsrv.bukkit.scheduler.BukkitScheduler; import com.discordsrv.bukkit.scheduler.FoliaScheduler; import com.discordsrv.bukkit.scheduler.IBukkitScheduler; import com.discordsrv.common.ServerDiscordSRV; +import com.discordsrv.common.abstraction.plugin.PluginManager; import com.discordsrv.common.command.game.handler.ICommandHandler; import com.discordsrv.common.config.configurate.manager.ConnectionConfigManager; import com.discordsrv.common.config.configurate.manager.MainConfigManager; import com.discordsrv.common.config.configurate.manager.MessagesConfigManager; import com.discordsrv.common.config.messages.MessagesConfig; -import com.discordsrv.common.debug.data.OnlineMode; -import com.discordsrv.common.messageforwarding.game.minecrafttodiscord.MinecraftToDiscordChatModule; -import com.discordsrv.common.plugin.PluginManager; +import com.discordsrv.common.feature.debug.data.OnlineMode; +import com.discordsrv.common.feature.messageforwarding.game.minecrafttodiscord.MinecraftToDiscordChatModule; import net.kyori.adventure.platform.bukkit.BukkitAudiences; import org.bukkit.Server; import org.bukkit.plugin.ServicePriority; diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/DiscordSRVBukkitBootstrap.java b/bukkit/src/main/java/com/discordsrv/bukkit/DiscordSRVBukkitBootstrap.java index eb6c7791..41e7e8fc 100644 --- a/bukkit/src/main/java/com/discordsrv/bukkit/DiscordSRVBukkitBootstrap.java +++ b/bukkit/src/main/java/com/discordsrv/bukkit/DiscordSRVBukkitBootstrap.java @@ -18,10 +18,10 @@ package com.discordsrv.bukkit; -import com.discordsrv.common.bootstrap.IBootstrap; -import com.discordsrv.common.bootstrap.LifecycleManager; -import com.discordsrv.common.logging.Logger; -import com.discordsrv.common.logging.backend.impl.JavaLoggerImpl; +import com.discordsrv.common.abstraction.bootstrap.IBootstrap; +import com.discordsrv.common.abstraction.bootstrap.LifecycleManager; +import com.discordsrv.common.core.logging.Logger; +import com.discordsrv.common.core.logging.backend.impl.JavaLoggerImpl; import dev.vankka.dependencydownload.classpath.ClasspathAppender; import dev.vankka.dependencydownload.jarinjar.classloader.JarInJarClassLoader; import dev.vankka.mcdependencydownload.bukkit.bootstrap.BukkitBootstrap; diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/ban/BukkitBanModule.java b/bukkit/src/main/java/com/discordsrv/bukkit/ban/BukkitBanModule.java index e802082f..1c615a5e 100644 --- a/bukkit/src/main/java/com/discordsrv/bukkit/ban/BukkitBanModule.java +++ b/bukkit/src/main/java/com/discordsrv/bukkit/ban/BukkitBanModule.java @@ -22,9 +22,9 @@ import com.discordsrv.api.component.MinecraftComponent; import com.discordsrv.api.module.type.PunishmentModule; import com.discordsrv.api.punishment.Punishment; import com.discordsrv.bukkit.BukkitDiscordSRV; -import com.discordsrv.common.bansync.BanSyncModule; -import com.discordsrv.common.component.util.ComponentUtil; -import com.discordsrv.common.module.type.AbstractModule; +import com.discordsrv.common.core.module.type.AbstractModule; +import com.discordsrv.common.feature.bansync.BanSyncModule; +import com.discordsrv.common.util.ComponentUtil; import net.kyori.adventure.platform.bukkit.BukkitComponentSerializer; import org.bukkit.BanEntry; import org.bukkit.BanList; diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/command/game/handler/AbstractBukkitCommandHandler.java b/bukkit/src/main/java/com/discordsrv/bukkit/command/game/handler/AbstractBukkitCommandHandler.java index b98c88cb..c858c69b 100644 --- a/bukkit/src/main/java/com/discordsrv/bukkit/command/game/handler/AbstractBukkitCommandHandler.java +++ b/bukkit/src/main/java/com/discordsrv/bukkit/command/game/handler/AbstractBukkitCommandHandler.java @@ -23,8 +23,8 @@ import com.discordsrv.bukkit.command.game.sender.BukkitCommandSender; import com.discordsrv.common.command.game.abstraction.GameCommand; import com.discordsrv.common.command.game.handler.ICommandHandler; import com.discordsrv.common.command.game.sender.ICommandSender; -import com.discordsrv.common.logging.Logger; -import com.discordsrv.common.logging.NamedLogger; +import com.discordsrv.common.core.logging.Logger; +import com.discordsrv.common.core.logging.NamedLogger; import org.bukkit.Server; import org.bukkit.command.CommandMap; import org.bukkit.command.CommandSender; diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/component/translation/BukkitTranslationLoader.java b/bukkit/src/main/java/com/discordsrv/bukkit/component/translation/BukkitTranslationLoader.java index 7c04e1a2..0309c200 100644 --- a/bukkit/src/main/java/com/discordsrv/bukkit/component/translation/BukkitTranslationLoader.java +++ b/bukkit/src/main/java/com/discordsrv/bukkit/component/translation/BukkitTranslationLoader.java @@ -19,9 +19,9 @@ package com.discordsrv.bukkit.component.translation; import com.discordsrv.bukkit.BukkitDiscordSRV; -import com.discordsrv.common.component.translation.Translation; -import com.discordsrv.common.component.translation.TranslationRegistry; -import com.discordsrv.common.logging.NamedLogger; +import com.discordsrv.common.core.component.translation.Translation; +import com.discordsrv.common.core.component.translation.TranslationRegistry; +import com.discordsrv.common.core.logging.NamedLogger; import com.fasterxml.jackson.databind.JsonNode; import java.io.IOException; diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/console/BukkitConsole.java b/bukkit/src/main/java/com/discordsrv/bukkit/console/BukkitConsole.java index 7c1f1298..7c80654b 100644 --- a/bukkit/src/main/java/com/discordsrv/bukkit/console/BukkitConsole.java +++ b/bukkit/src/main/java/com/discordsrv/bukkit/console/BukkitConsole.java @@ -22,11 +22,11 @@ import com.discordsrv.bukkit.BukkitDiscordSRV; import com.discordsrv.bukkit.command.game.sender.BukkitCommandSender; import com.discordsrv.bukkit.console.executor.BukkitCommandExecutorProvider; import com.discordsrv.common.command.game.executor.CommandExecutorProvider; -import com.discordsrv.common.console.Console; -import com.discordsrv.common.logging.NamedLogger; -import com.discordsrv.common.logging.backend.LoggingBackend; -import com.discordsrv.common.logging.backend.impl.JavaLoggerImpl; -import com.discordsrv.common.logging.backend.impl.Log4JLoggerImpl; +import com.discordsrv.common.core.logging.NamedLogger; +import com.discordsrv.common.core.logging.backend.LoggingBackend; +import com.discordsrv.common.core.logging.backend.impl.JavaLoggerImpl; +import com.discordsrv.common.core.logging.backend.impl.Log4JLoggerImpl; +import com.discordsrv.common.feature.console.Console; public class BukkitConsole extends BukkitCommandSender implements Console { diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/console/executor/BukkitCommandExecutorProvider.java b/bukkit/src/main/java/com/discordsrv/bukkit/console/executor/BukkitCommandExecutorProvider.java index d92d926e..d520e16a 100644 --- a/bukkit/src/main/java/com/discordsrv/bukkit/console/executor/BukkitCommandExecutorProvider.java +++ b/bukkit/src/main/java/com/discordsrv/bukkit/console/executor/BukkitCommandExecutorProvider.java @@ -21,7 +21,7 @@ package com.discordsrv.bukkit.console.executor; import com.discordsrv.bukkit.BukkitDiscordSRV; import com.discordsrv.common.command.game.executor.CommandExecutor; import com.discordsrv.common.command.game.executor.CommandExecutorProvider; -import com.discordsrv.common.component.util.ComponentUtil; +import com.discordsrv.common.util.ComponentUtil; import net.kyori.adventure.text.Component; import org.bukkit.Server; import org.bukkit.command.CommandSender; diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/integration/EssentialsXIntegration.java b/bukkit/src/main/java/com/discordsrv/bukkit/integration/EssentialsXIntegration.java index 0d28ea7a..4c903ab2 100644 --- a/bukkit/src/main/java/com/discordsrv/bukkit/integration/EssentialsXIntegration.java +++ b/bukkit/src/main/java/com/discordsrv/bukkit/integration/EssentialsXIntegration.java @@ -20,18 +20,18 @@ package com.discordsrv.bukkit.integration; import com.discordsrv.api.channel.GameChannel; import com.discordsrv.api.component.MinecraftComponent; -import com.discordsrv.api.event.bus.EventPriority; -import com.discordsrv.api.event.bus.Subscribe; -import com.discordsrv.api.event.events.channel.GameChannelLookupEvent; -import com.discordsrv.api.event.events.message.receive.game.GameChatMessageReceiveEvent; +import com.discordsrv.api.eventbus.EventPriority; +import com.discordsrv.api.eventbus.Subscribe; +import com.discordsrv.api.events.channel.GameChannelLookupEvent; +import com.discordsrv.api.events.message.receive.game.GameChatMessageReceiveEvent; import com.discordsrv.api.module.type.NicknameModule; import com.discordsrv.api.module.type.PunishmentModule; import com.discordsrv.api.player.DiscordSRVPlayer; import com.discordsrv.api.punishment.Punishment; import com.discordsrv.bukkit.BukkitDiscordSRV; import com.discordsrv.bukkit.player.BukkitPlayer; -import com.discordsrv.common.component.util.ComponentUtil; -import com.discordsrv.common.module.type.PluginIntegration; +import com.discordsrv.common.core.module.type.PluginIntegration; +import com.discordsrv.common.util.ComponentUtil; import com.earth2me.essentials.Essentials; import com.earth2me.essentials.User; import com.earth2me.essentials.UserData; diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/integration/PlaceholderAPIIntegration.java b/bukkit/src/main/java/com/discordsrv/bukkit/integration/PlaceholderAPIIntegration.java index 5c6ef916..fbaf3f77 100644 --- a/bukkit/src/main/java/com/discordsrv/bukkit/integration/PlaceholderAPIIntegration.java +++ b/bukkit/src/main/java/com/discordsrv/bukkit/integration/PlaceholderAPIIntegration.java @@ -18,15 +18,15 @@ package com.discordsrv.bukkit.integration; -import com.discordsrv.api.event.bus.Subscribe; -import com.discordsrv.api.event.events.placeholder.PlaceholderLookupEvent; +import com.discordsrv.api.eventbus.Subscribe; +import com.discordsrv.api.events.placeholder.PlaceholderLookupEvent; import com.discordsrv.api.placeholder.PlaceholderLookupResult; import com.discordsrv.api.placeholder.format.PlainPlaceholderFormat; import com.discordsrv.api.player.DiscordSRVPlayer; import com.discordsrv.api.profile.IProfile; import com.discordsrv.bukkit.BukkitDiscordSRV; -import com.discordsrv.common.module.type.PluginIntegration; -import com.discordsrv.common.player.IOfflinePlayer; +import com.discordsrv.common.abstraction.player.IOfflinePlayer; +import com.discordsrv.common.core.module.type.PluginIntegration; import me.clip.placeholderapi.PlaceholderAPI; import me.clip.placeholderapi.expansion.PlaceholderExpansion; import net.kyori.adventure.platform.bukkit.BukkitComponentSerializer; diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/integration/VaultIntegration.java b/bukkit/src/main/java/com/discordsrv/bukkit/integration/VaultIntegration.java index 8faae50d..1f8f8291 100644 --- a/bukkit/src/main/java/com/discordsrv/bukkit/integration/VaultIntegration.java +++ b/bukkit/src/main/java/com/discordsrv/bukkit/integration/VaultIntegration.java @@ -20,10 +20,10 @@ package com.discordsrv.bukkit.integration; import com.discordsrv.api.module.type.PermissionModule; import com.discordsrv.bukkit.BukkitDiscordSRV; +import com.discordsrv.common.core.module.type.PluginIntegration; import com.discordsrv.common.exception.MessageException; -import com.discordsrv.common.function.CheckedSupplier; -import com.discordsrv.common.future.util.CompletableFutureUtil; -import com.discordsrv.common.module.type.PluginIntegration; +import com.discordsrv.common.util.CompletableFutureUtil; +import com.discordsrv.common.util.function.CheckedSupplier; import net.milkbowl.vault.chat.Chat; import net.milkbowl.vault.permission.Permission; import org.bukkit.OfflinePlayer; diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/integration/chat/ChattyChatIntegration.java b/bukkit/src/main/java/com/discordsrv/bukkit/integration/chat/ChattyChatIntegration.java index 531401d4..05d4400d 100644 --- a/bukkit/src/main/java/com/discordsrv/bukkit/integration/chat/ChattyChatIntegration.java +++ b/bukkit/src/main/java/com/discordsrv/bukkit/integration/chat/ChattyChatIntegration.java @@ -20,15 +20,15 @@ package com.discordsrv.bukkit.integration.chat; import com.discordsrv.api.channel.GameChannel; import com.discordsrv.api.component.MinecraftComponent; -import com.discordsrv.api.event.bus.Subscribe; -import com.discordsrv.api.event.events.channel.GameChannelLookupEvent; -import com.discordsrv.api.event.events.message.receive.game.GameChatMessageReceiveEvent; +import com.discordsrv.api.eventbus.Subscribe; +import com.discordsrv.api.events.channel.GameChannelLookupEvent; +import com.discordsrv.api.events.message.receive.game.GameChatMessageReceiveEvent; import com.discordsrv.api.player.DiscordSRVPlayer; import com.discordsrv.bukkit.BukkitDiscordSRV; import com.discordsrv.bukkit.player.BukkitPlayer; -import com.discordsrv.common.component.util.ComponentUtil; -import com.discordsrv.common.logging.NamedLogger; -import com.discordsrv.common.module.type.PluginIntegration; +import com.discordsrv.common.core.logging.NamedLogger; +import com.discordsrv.common.core.module.type.PluginIntegration; +import com.discordsrv.common.util.ComponentUtil; import net.kyori.adventure.platform.bukkit.BukkitComponentSerializer; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/integration/chat/GriefPreventionChatIntegration.java b/bukkit/src/main/java/com/discordsrv/bukkit/integration/chat/GriefPreventionChatIntegration.java index e3fba0a6..a4f767ad 100644 --- a/bukkit/src/main/java/com/discordsrv/bukkit/integration/chat/GriefPreventionChatIntegration.java +++ b/bukkit/src/main/java/com/discordsrv/bukkit/integration/chat/GriefPreventionChatIntegration.java @@ -18,13 +18,13 @@ package com.discordsrv.bukkit.integration.chat; -import com.discordsrv.api.event.bus.EventPriority; -import com.discordsrv.api.event.bus.Subscribe; -import com.discordsrv.api.event.events.message.receive.game.GameChatMessageReceiveEvent; +import com.discordsrv.api.eventbus.EventPriority; +import com.discordsrv.api.eventbus.Subscribe; +import com.discordsrv.api.events.message.receive.game.GameChatMessageReceiveEvent; import com.discordsrv.api.player.DiscordSRVPlayer; import com.discordsrv.bukkit.BukkitDiscordSRV; -import com.discordsrv.common.logging.NamedLogger; -import com.discordsrv.common.module.type.PluginIntegration; +import com.discordsrv.common.core.logging.NamedLogger; +import com.discordsrv.common.core.module.type.PluginIntegration; import me.ryanhamshire.GriefPrevention.GriefPrevention; import org.jetbrains.annotations.NotNull; diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/integration/chat/LunaChatIntegration.java b/bukkit/src/main/java/com/discordsrv/bukkit/integration/chat/LunaChatIntegration.java index c949ddb8..6eaef265 100644 --- a/bukkit/src/main/java/com/discordsrv/bukkit/integration/chat/LunaChatIntegration.java +++ b/bukkit/src/main/java/com/discordsrv/bukkit/integration/chat/LunaChatIntegration.java @@ -20,15 +20,15 @@ package com.discordsrv.bukkit.integration.chat; import com.discordsrv.api.channel.GameChannel; import com.discordsrv.api.component.MinecraftComponent; -import com.discordsrv.api.event.bus.Subscribe; -import com.discordsrv.api.event.events.channel.GameChannelLookupEvent; -import com.discordsrv.api.event.events.message.receive.game.GameChatMessageReceiveEvent; +import com.discordsrv.api.eventbus.Subscribe; +import com.discordsrv.api.events.channel.GameChannelLookupEvent; +import com.discordsrv.api.events.message.receive.game.GameChatMessageReceiveEvent; import com.discordsrv.api.player.DiscordSRVPlayer; import com.discordsrv.bukkit.BukkitDiscordSRV; import com.discordsrv.bukkit.player.BukkitPlayer; -import com.discordsrv.common.component.util.ComponentUtil; -import com.discordsrv.common.logging.NamedLogger; -import com.discordsrv.common.module.type.PluginIntegration; +import com.discordsrv.common.core.logging.NamedLogger; +import com.discordsrv.common.core.module.type.PluginIntegration; +import com.discordsrv.common.util.ComponentUtil; import com.github.ucchyocean.lc3.LunaChatAPI; import com.github.ucchyocean.lc3.LunaChatBukkit; import com.github.ucchyocean.lc3.bukkit.event.LunaChatBukkitChannelChatEvent; diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/integration/chat/McMMOChatIntegration.java b/bukkit/src/main/java/com/discordsrv/bukkit/integration/chat/McMMOChatIntegration.java index c848332e..de09c2ad 100644 --- a/bukkit/src/main/java/com/discordsrv/bukkit/integration/chat/McMMOChatIntegration.java +++ b/bukkit/src/main/java/com/discordsrv/bukkit/integration/chat/McMMOChatIntegration.java @@ -20,16 +20,16 @@ package com.discordsrv.bukkit.integration.chat; import com.discordsrv.api.channel.GameChannel; import com.discordsrv.api.component.MinecraftComponent; -import com.discordsrv.api.event.bus.EventPriority; -import com.discordsrv.api.event.bus.Subscribe; -import com.discordsrv.api.event.events.channel.GameChannelLookupEvent; -import com.discordsrv.api.event.events.message.receive.game.GameChatMessageReceiveEvent; +import com.discordsrv.api.eventbus.EventPriority; +import com.discordsrv.api.eventbus.Subscribe; +import com.discordsrv.api.events.channel.GameChannelLookupEvent; +import com.discordsrv.api.events.message.receive.game.GameChatMessageReceiveEvent; import com.discordsrv.api.player.DiscordSRVPlayer; import com.discordsrv.bukkit.BukkitDiscordSRV; import com.discordsrv.bukkit.player.BukkitPlayer; -import com.discordsrv.common.component.util.ComponentUtil; -import com.discordsrv.common.logging.NamedLogger; -import com.discordsrv.common.module.type.PluginIntegration; +import com.discordsrv.common.core.logging.NamedLogger; +import com.discordsrv.common.core.module.type.PluginIntegration; +import com.discordsrv.common.util.ComponentUtil; import com.gmail.nossr50.api.ChatAPI; import com.gmail.nossr50.chat.author.Author; import com.gmail.nossr50.chat.author.PlayerAuthor; diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/integration/chat/TownyChatIntegration.java b/bukkit/src/main/java/com/discordsrv/bukkit/integration/chat/TownyChatIntegration.java index 542c0143..18a5bf26 100644 --- a/bukkit/src/main/java/com/discordsrv/bukkit/integration/chat/TownyChatIntegration.java +++ b/bukkit/src/main/java/com/discordsrv/bukkit/integration/chat/TownyChatIntegration.java @@ -20,15 +20,15 @@ package com.discordsrv.bukkit.integration.chat; import com.discordsrv.api.channel.GameChannel; import com.discordsrv.api.component.MinecraftComponent; -import com.discordsrv.api.event.bus.Subscribe; -import com.discordsrv.api.event.events.channel.GameChannelLookupEvent; -import com.discordsrv.api.event.events.message.receive.game.GameChatMessageReceiveEvent; +import com.discordsrv.api.eventbus.Subscribe; +import com.discordsrv.api.events.channel.GameChannelLookupEvent; +import com.discordsrv.api.events.message.receive.game.GameChatMessageReceiveEvent; import com.discordsrv.api.player.DiscordSRVPlayer; import com.discordsrv.bukkit.BukkitDiscordSRV; import com.discordsrv.bukkit.player.BukkitPlayer; -import com.discordsrv.common.component.util.ComponentUtil; -import com.discordsrv.common.logging.NamedLogger; -import com.discordsrv.common.module.type.PluginIntegration; +import com.discordsrv.common.core.logging.NamedLogger; +import com.discordsrv.common.core.module.type.PluginIntegration; +import com.discordsrv.common.util.ComponentUtil; import com.palmergames.bukkit.TownyChat.Chat; import com.palmergames.bukkit.TownyChat.channels.Channel; import com.palmergames.bukkit.TownyChat.events.AsyncChatHookEvent; diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/integration/chat/VentureChatIntegration.java b/bukkit/src/main/java/com/discordsrv/bukkit/integration/chat/VentureChatIntegration.java index 4fbea4a7..981f50b4 100644 --- a/bukkit/src/main/java/com/discordsrv/bukkit/integration/chat/VentureChatIntegration.java +++ b/bukkit/src/main/java/com/discordsrv/bukkit/integration/chat/VentureChatIntegration.java @@ -20,15 +20,15 @@ package com.discordsrv.bukkit.integration.chat; import com.discordsrv.api.channel.GameChannel; import com.discordsrv.api.component.MinecraftComponent; -import com.discordsrv.api.event.bus.Subscribe; -import com.discordsrv.api.event.events.channel.GameChannelLookupEvent; -import com.discordsrv.api.event.events.message.receive.game.GameChatMessageReceiveEvent; +import com.discordsrv.api.eventbus.Subscribe; +import com.discordsrv.api.events.channel.GameChannelLookupEvent; +import com.discordsrv.api.events.message.receive.game.GameChatMessageReceiveEvent; import com.discordsrv.api.player.DiscordSRVPlayer; import com.discordsrv.bukkit.BukkitDiscordSRV; import com.discordsrv.bukkit.player.BukkitPlayer; -import com.discordsrv.common.component.util.ComponentUtil; -import com.discordsrv.common.logging.NamedLogger; -import com.discordsrv.common.module.type.PluginIntegration; +import com.discordsrv.common.core.logging.NamedLogger; +import com.discordsrv.common.core.module.type.PluginIntegration; +import com.discordsrv.common.util.ComponentUtil; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.api.events.VentureChatEvent; diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/listener/BukkitDeathListener.java b/bukkit/src/main/java/com/discordsrv/bukkit/listener/BukkitDeathListener.java index 14389c37..d81228e8 100644 --- a/bukkit/src/main/java/com/discordsrv/bukkit/listener/BukkitDeathListener.java +++ b/bukkit/src/main/java/com/discordsrv/bukkit/listener/BukkitDeathListener.java @@ -19,7 +19,7 @@ package com.discordsrv.bukkit.listener; import com.discordsrv.api.component.MinecraftComponent; -import com.discordsrv.api.event.events.message.receive.game.DeathMessageReceiveEvent; +import com.discordsrv.api.events.message.receive.game.DeathMessageReceiveEvent; import com.discordsrv.api.player.DiscordSRVPlayer; import com.discordsrv.bukkit.BukkitDiscordSRV; import com.discordsrv.bukkit.component.PaperComponentHandle; diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/listener/BukkitStatusMessageListener.java b/bukkit/src/main/java/com/discordsrv/bukkit/listener/BukkitStatusMessageListener.java index e10ca33d..34c194d0 100644 --- a/bukkit/src/main/java/com/discordsrv/bukkit/listener/BukkitStatusMessageListener.java +++ b/bukkit/src/main/java/com/discordsrv/bukkit/listener/BukkitStatusMessageListener.java @@ -19,8 +19,8 @@ package com.discordsrv.bukkit.listener; import com.discordsrv.api.component.MinecraftComponent; -import com.discordsrv.api.event.events.message.receive.game.JoinMessageReceiveEvent; -import com.discordsrv.api.event.events.message.receive.game.LeaveMessageReceiveEvent; +import com.discordsrv.api.events.message.receive.game.JoinMessageReceiveEvent; +import com.discordsrv.api.events.message.receive.game.LeaveMessageReceiveEvent; import com.discordsrv.api.player.DiscordSRVPlayer; import com.discordsrv.bukkit.BukkitDiscordSRV; import com.discordsrv.bukkit.component.PaperComponentHandle; diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/listener/award/BukkitAchievementListener.java b/bukkit/src/main/java/com/discordsrv/bukkit/listener/award/BukkitAchievementListener.java index fd61a4ef..1ef12a5f 100644 --- a/bukkit/src/main/java/com/discordsrv/bukkit/listener/award/BukkitAchievementListener.java +++ b/bukkit/src/main/java/com/discordsrv/bukkit/listener/award/BukkitAchievementListener.java @@ -20,7 +20,7 @@ package com.discordsrv.bukkit.listener.award; import com.discordsrv.api.component.MinecraftComponent; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.component.util.ComponentUtil; +import com.discordsrv.common.util.ComponentUtil; import net.kyori.adventure.platform.bukkit.BukkitComponentSerializer; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/listener/award/BukkitAwardForwarder.java b/bukkit/src/main/java/com/discordsrv/bukkit/listener/award/BukkitAwardForwarder.java index 8dd378f7..4ad720a1 100644 --- a/bukkit/src/main/java/com/discordsrv/bukkit/listener/award/BukkitAwardForwarder.java +++ b/bukkit/src/main/java/com/discordsrv/bukkit/listener/award/BukkitAwardForwarder.java @@ -19,9 +19,9 @@ package com.discordsrv.bukkit.listener.award; import com.discordsrv.api.component.MinecraftComponent; -import com.discordsrv.api.event.events.message.receive.game.AwardMessageReceiveEvent; +import com.discordsrv.api.events.message.receive.game.AwardMessageReceiveEvent; import com.discordsrv.bukkit.BukkitDiscordSRV; -import com.discordsrv.common.player.IPlayer; +import com.discordsrv.common.abstraction.player.IPlayer; import org.bukkit.entity.Player; import org.bukkit.event.Listener; import org.intellij.lang.annotations.Language; diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/listener/chat/BukkitChatForwarder.java b/bukkit/src/main/java/com/discordsrv/bukkit/listener/chat/BukkitChatForwarder.java index fbb6d46c..cd49f9ab 100644 --- a/bukkit/src/main/java/com/discordsrv/bukkit/listener/chat/BukkitChatForwarder.java +++ b/bukkit/src/main/java/com/discordsrv/bukkit/listener/chat/BukkitChatForwarder.java @@ -19,11 +19,11 @@ package com.discordsrv.bukkit.listener.chat; import com.discordsrv.api.component.MinecraftComponent; -import com.discordsrv.api.event.events.message.receive.game.GameChatMessageReceiveEvent; +import com.discordsrv.api.events.message.receive.game.GameChatMessageReceiveEvent; import com.discordsrv.bukkit.BukkitDiscordSRV; import com.discordsrv.bukkit.component.PaperComponentHandle; -import com.discordsrv.common.channel.GlobalChannel; -import com.discordsrv.common.player.IPlayer; +import com.discordsrv.common.abstraction.player.IPlayer; +import com.discordsrv.common.feature.channel.global.GlobalChannel; import org.bukkit.entity.Player; import org.bukkit.event.Event; import org.bukkit.event.Listener; diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/listener/chat/BukkitChatListener.java b/bukkit/src/main/java/com/discordsrv/bukkit/listener/chat/BukkitChatListener.java index b164781f..30694091 100644 --- a/bukkit/src/main/java/com/discordsrv/bukkit/listener/chat/BukkitChatListener.java +++ b/bukkit/src/main/java/com/discordsrv/bukkit/listener/chat/BukkitChatListener.java @@ -19,7 +19,7 @@ package com.discordsrv.bukkit.listener.chat; import com.discordsrv.api.component.MinecraftComponent; -import com.discordsrv.common.component.util.ComponentUtil; +import com.discordsrv.common.util.ComponentUtil; import net.kyori.adventure.platform.bukkit.BukkitComponentSerializer; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/player/BukkitOfflinePlayer.java b/bukkit/src/main/java/com/discordsrv/bukkit/player/BukkitOfflinePlayer.java index 11ab9390..274fc7ad 100644 --- a/bukkit/src/main/java/com/discordsrv/bukkit/player/BukkitOfflinePlayer.java +++ b/bukkit/src/main/java/com/discordsrv/bukkit/player/BukkitOfflinePlayer.java @@ -20,8 +20,8 @@ package com.discordsrv.bukkit.player; import com.discordsrv.bukkit.BukkitDiscordSRV; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.player.IOfflinePlayer; -import com.discordsrv.common.player.provider.model.SkinInfo; +import com.discordsrv.common.abstraction.player.IOfflinePlayer; +import com.discordsrv.common.abstraction.player.provider.model.SkinInfo; import net.kyori.adventure.identity.Identity; import org.bukkit.OfflinePlayer; import org.jetbrains.annotations.NotNull; diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/player/BukkitPlayer.java b/bukkit/src/main/java/com/discordsrv/bukkit/player/BukkitPlayer.java index 25babb45..77a9d3ee 100644 --- a/bukkit/src/main/java/com/discordsrv/bukkit/player/BukkitPlayer.java +++ b/bukkit/src/main/java/com/discordsrv/bukkit/player/BukkitPlayer.java @@ -23,9 +23,9 @@ import com.discordsrv.bukkit.BukkitDiscordSRV; import com.discordsrv.bukkit.command.game.sender.BukkitCommandSender; import com.discordsrv.bukkit.component.PaperComponentHandle; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.component.util.ComponentUtil; -import com.discordsrv.common.player.IPlayer; -import com.discordsrv.common.player.provider.model.SkinInfo; +import com.discordsrv.common.abstraction.player.IPlayer; +import com.discordsrv.common.abstraction.player.provider.model.SkinInfo; +import com.discordsrv.common.util.ComponentUtil; import net.kyori.adventure.identity.Identity; import net.kyori.adventure.platform.bukkit.BukkitComponentSerializer; import net.kyori.adventure.text.Component; diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/player/BukkitPlayerProvider.java b/bukkit/src/main/java/com/discordsrv/bukkit/player/BukkitPlayerProvider.java index f2b64123..d536f841 100644 --- a/bukkit/src/main/java/com/discordsrv/bukkit/player/BukkitPlayerProvider.java +++ b/bukkit/src/main/java/com/discordsrv/bukkit/player/BukkitPlayerProvider.java @@ -19,9 +19,9 @@ package com.discordsrv.bukkit.player; import com.discordsrv.bukkit.BukkitDiscordSRV; -import com.discordsrv.common.player.IOfflinePlayer; -import com.discordsrv.common.player.IPlayer; -import com.discordsrv.common.player.provider.ServerPlayerProvider; +import com.discordsrv.common.abstraction.player.IOfflinePlayer; +import com.discordsrv.common.abstraction.player.IPlayer; +import com.discordsrv.common.abstraction.player.provider.ServerPlayerProvider; import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/plugin/BukkitPluginManager.java b/bukkit/src/main/java/com/discordsrv/bukkit/plugin/BukkitPluginManager.java index 8fde0dc2..0cd69760 100644 --- a/bukkit/src/main/java/com/discordsrv/bukkit/plugin/BukkitPluginManager.java +++ b/bukkit/src/main/java/com/discordsrv/bukkit/plugin/BukkitPluginManager.java @@ -19,8 +19,8 @@ package com.discordsrv.bukkit.plugin; import com.discordsrv.bukkit.BukkitDiscordSRV; -import com.discordsrv.common.plugin.Plugin; -import com.discordsrv.common.plugin.PluginManager; +import com.discordsrv.common.abstraction.plugin.Plugin; +import com.discordsrv.common.abstraction.plugin.PluginManager; import org.bukkit.plugin.PluginDescriptionFile; import java.util.Arrays; diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/requiredlinking/BukkitRequiredLinkingModule.java b/bukkit/src/main/java/com/discordsrv/bukkit/requiredlinking/BukkitRequiredLinkingModule.java index c463e539..f3977ae2 100644 --- a/bukkit/src/main/java/com/discordsrv/bukkit/requiredlinking/BukkitRequiredLinkingModule.java +++ b/bukkit/src/main/java/com/discordsrv/bukkit/requiredlinking/BukkitRequiredLinkingModule.java @@ -21,10 +21,10 @@ package com.discordsrv.bukkit.requiredlinking; import com.discordsrv.bukkit.BukkitDiscordSRV; import com.discordsrv.bukkit.config.main.BukkitRequiredLinkingConfig; import com.discordsrv.common.DiscordSRV; +import com.discordsrv.common.abstraction.player.IPlayer; import com.discordsrv.common.config.main.linking.ServerRequiredLinkingConfig; -import com.discordsrv.common.linking.LinkStore; -import com.discordsrv.common.linking.requirelinking.ServerRequireLinkingModule; -import com.discordsrv.common.player.IPlayer; +import com.discordsrv.common.feature.linking.LinkStore; +import com.discordsrv.common.feature.linking.requirelinking.ServerRequireLinkingModule; import com.github.benmanes.caffeine.cache.Cache; import net.kyori.adventure.platform.bukkit.BukkitComponentSerializer; import net.kyori.adventure.text.Component; diff --git a/bukkit/src/main/java/com/discordsrv/bukkit/scheduler/AbstractBukkitScheduler.java b/bukkit/src/main/java/com/discordsrv/bukkit/scheduler/AbstractBukkitScheduler.java index edf6c8d7..8ab64594 100644 --- a/bukkit/src/main/java/com/discordsrv/bukkit/scheduler/AbstractBukkitScheduler.java +++ b/bukkit/src/main/java/com/discordsrv/bukkit/scheduler/AbstractBukkitScheduler.java @@ -21,8 +21,8 @@ package com.discordsrv.bukkit.scheduler; import com.discordsrv.bukkit.BukkitDiscordSRV; import com.discordsrv.bukkit.DiscordSRVBukkitBootstrap; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.scheduler.ServerScheduler; -import com.discordsrv.common.scheduler.StandardScheduler; +import com.discordsrv.common.core.scheduler.ServerScheduler; +import com.discordsrv.common.core.scheduler.StandardScheduler; import org.bukkit.Server; import org.bukkit.plugin.Plugin; diff --git a/bungee/src/main/java/com/discordsrv/bungee/BungeeDiscordSRV.java b/bungee/src/main/java/com/discordsrv/bungee/BungeeDiscordSRV.java index 4fb9aeb0..4d86570f 100644 --- a/bungee/src/main/java/com/discordsrv/bungee/BungeeDiscordSRV.java +++ b/bungee/src/main/java/com/discordsrv/bungee/BungeeDiscordSRV.java @@ -23,6 +23,7 @@ import com.discordsrv.bungee.console.BungeeConsole; import com.discordsrv.bungee.player.BungeePlayerProvider; import com.discordsrv.bungee.plugin.BungeePluginManager; import com.discordsrv.common.ProxyDiscordSRV; +import com.discordsrv.common.abstraction.plugin.PluginManager; import com.discordsrv.common.command.game.handler.ICommandHandler; import com.discordsrv.common.config.configurate.manager.ConnectionConfigManager; import com.discordsrv.common.config.configurate.manager.MainConfigManager; @@ -30,9 +31,8 @@ import com.discordsrv.common.config.configurate.manager.MessagesConfigManager; import com.discordsrv.common.config.connection.ConnectionConfig; import com.discordsrv.common.config.main.MainConfig; import com.discordsrv.common.config.messages.MessagesConfig; -import com.discordsrv.common.debug.data.OnlineMode; -import com.discordsrv.common.plugin.PluginManager; -import com.discordsrv.common.scheduler.StandardScheduler; +import com.discordsrv.common.core.scheduler.StandardScheduler; +import com.discordsrv.common.feature.debug.data.OnlineMode; import net.kyori.adventure.platform.bungeecord.BungeeAudiences; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.plugin.Plugin; diff --git a/bungee/src/main/java/com/discordsrv/bungee/DiscordSRVBungeeBootstrap.java b/bungee/src/main/java/com/discordsrv/bungee/DiscordSRVBungeeBootstrap.java index 6e4b1b97..666eb99b 100644 --- a/bungee/src/main/java/com/discordsrv/bungee/DiscordSRVBungeeBootstrap.java +++ b/bungee/src/main/java/com/discordsrv/bungee/DiscordSRVBungeeBootstrap.java @@ -18,10 +18,10 @@ package com.discordsrv.bungee; -import com.discordsrv.common.bootstrap.IBootstrap; -import com.discordsrv.common.bootstrap.LifecycleManager; -import com.discordsrv.common.logging.Logger; -import com.discordsrv.common.logging.backend.impl.JavaLoggerImpl; +import com.discordsrv.common.abstraction.bootstrap.IBootstrap; +import com.discordsrv.common.abstraction.bootstrap.LifecycleManager; +import com.discordsrv.common.core.logging.Logger; +import com.discordsrv.common.core.logging.backend.impl.JavaLoggerImpl; import dev.vankka.dependencydownload.classpath.ClasspathAppender; import dev.vankka.dependencydownload.jarinjar.classloader.JarInJarClassLoader; import dev.vankka.mcdependencydownload.bungee.bootstrap.BungeeBootstrap; diff --git a/bungee/src/main/java/com/discordsrv/bungee/console/BungeeConsole.java b/bungee/src/main/java/com/discordsrv/bungee/console/BungeeConsole.java index 7dfb496b..ed332b9c 100644 --- a/bungee/src/main/java/com/discordsrv/bungee/console/BungeeConsole.java +++ b/bungee/src/main/java/com/discordsrv/bungee/console/BungeeConsole.java @@ -22,9 +22,9 @@ import com.discordsrv.bungee.BungeeDiscordSRV; import com.discordsrv.bungee.command.game.sender.BungeeCommandSender; import com.discordsrv.bungee.console.executor.BungeeCommandExecutorProvider; import com.discordsrv.common.command.game.executor.CommandExecutorProvider; -import com.discordsrv.common.console.Console; -import com.discordsrv.common.logging.backend.LoggingBackend; -import com.discordsrv.common.logging.backend.impl.JavaLoggerImpl; +import com.discordsrv.common.core.logging.backend.LoggingBackend; +import com.discordsrv.common.core.logging.backend.impl.JavaLoggerImpl; +import com.discordsrv.common.feature.console.Console; public class BungeeConsole extends BungeeCommandSender implements Console { diff --git a/bungee/src/main/java/com/discordsrv/bungee/player/BungeePlayer.java b/bungee/src/main/java/com/discordsrv/bungee/player/BungeePlayer.java index a768366a..a87fda13 100644 --- a/bungee/src/main/java/com/discordsrv/bungee/player/BungeePlayer.java +++ b/bungee/src/main/java/com/discordsrv/bungee/player/BungeePlayer.java @@ -22,8 +22,8 @@ import com.discordsrv.bungee.BungeeDiscordSRV; import com.discordsrv.bungee.command.game.sender.BungeeCommandSender; import com.discordsrv.bungee.component.util.BungeeComponentUtil; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.player.IPlayer; -import com.discordsrv.common.player.provider.model.SkinInfo; +import com.discordsrv.common.abstraction.player.IPlayer; +import com.discordsrv.common.abstraction.player.provider.model.SkinInfo; import net.kyori.adventure.identity.Identity; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer; diff --git a/bungee/src/main/java/com/discordsrv/bungee/player/BungeePlayerProvider.java b/bungee/src/main/java/com/discordsrv/bungee/player/BungeePlayerProvider.java index f3c3c62a..772d5928 100644 --- a/bungee/src/main/java/com/discordsrv/bungee/player/BungeePlayerProvider.java +++ b/bungee/src/main/java/com/discordsrv/bungee/player/BungeePlayerProvider.java @@ -19,7 +19,7 @@ package com.discordsrv.bungee.player; import com.discordsrv.bungee.BungeeDiscordSRV; -import com.discordsrv.common.player.provider.AbstractPlayerProvider; +import com.discordsrv.common.abstraction.player.provider.AbstractPlayerProvider; import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.event.PlayerDisconnectEvent; import net.md_5.bungee.api.event.PostLoginEvent; diff --git a/bungee/src/main/java/com/discordsrv/bungee/plugin/BungeePluginManager.java b/bungee/src/main/java/com/discordsrv/bungee/plugin/BungeePluginManager.java index a6541a13..60dd8da5 100644 --- a/bungee/src/main/java/com/discordsrv/bungee/plugin/BungeePluginManager.java +++ b/bungee/src/main/java/com/discordsrv/bungee/plugin/BungeePluginManager.java @@ -19,8 +19,8 @@ package com.discordsrv.bungee.plugin; import com.discordsrv.bungee.BungeeDiscordSRV; -import com.discordsrv.common.plugin.Plugin; -import com.discordsrv.common.plugin.PluginManager; +import com.discordsrv.common.abstraction.plugin.Plugin; +import com.discordsrv.common.abstraction.plugin.PluginManager; import net.md_5.bungee.api.plugin.PluginDescription; import java.util.Collections; diff --git a/common/src/main/java/com/discordsrv/common/AbstractDiscordSRV.java b/common/src/main/java/com/discordsrv/common/AbstractDiscordSRV.java index db532a42..5a1f983b 100644 --- a/common/src/main/java/com/discordsrv/common/AbstractDiscordSRV.java +++ b/common/src/main/java/com/discordsrv/common/AbstractDiscordSRV.java @@ -18,22 +18,15 @@ package com.discordsrv.common; -import com.discordsrv.api.event.events.lifecycle.DiscordSRVConnectedEvent; -import com.discordsrv.api.event.events.lifecycle.DiscordSRVReadyEvent; -import com.discordsrv.api.event.events.lifecycle.DiscordSRVReloadedEvent; -import com.discordsrv.api.event.events.lifecycle.DiscordSRVShuttingDownEvent; +import com.discordsrv.api.events.lifecycle.DiscordSRVConnectedEvent; +import com.discordsrv.api.events.lifecycle.DiscordSRVReadyEvent; +import com.discordsrv.api.events.lifecycle.DiscordSRVReloadedEvent; +import com.discordsrv.api.events.lifecycle.DiscordSRVShuttingDownEvent; import com.discordsrv.api.module.Module; -import com.discordsrv.common.api.util.ApiInstanceUtil; -import com.discordsrv.common.bansync.BanSyncModule; -import com.discordsrv.common.bootstrap.IBootstrap; -import com.discordsrv.common.channel.ChannelConfigHelper; -import com.discordsrv.common.channel.ChannelLockingModule; -import com.discordsrv.common.channel.GlobalChannelLookupModule; -import com.discordsrv.common.channel.TimedUpdaterModule; +import com.discordsrv.common.abstraction.bootstrap.IBootstrap; import com.discordsrv.common.command.discord.DiscordCommandModule; import com.discordsrv.common.command.game.GameCommandModule; import com.discordsrv.common.command.game.commands.subcommand.reload.ReloadResults; -import com.discordsrv.common.component.ComponentFactory; import com.discordsrv.common.config.configurate.manager.ConnectionConfigManager; import com.discordsrv.common.config.configurate.manager.MainConfigManager; import com.discordsrv.common.config.configurate.manager.MessagesConfigManager; @@ -44,48 +37,55 @@ import com.discordsrv.common.config.connection.UpdateConfig; import com.discordsrv.common.config.main.MainConfig; import com.discordsrv.common.config.main.linking.LinkedAccountConfig; import com.discordsrv.common.config.messages.MessagesConfig; -import com.discordsrv.common.console.ConsoleModule; -import com.discordsrv.common.debug.data.VersionInfo; -import com.discordsrv.common.dependency.DiscordSRVDependencyManager; -import com.discordsrv.common.destination.DestinationLookupHelper; +import com.discordsrv.common.core.component.ComponentFactory; +import com.discordsrv.common.core.dependency.DiscordSRVDependencyManager; +import com.discordsrv.common.core.eventbus.EventBusImpl; +import com.discordsrv.common.core.logging.Logger; +import com.discordsrv.common.core.logging.impl.DependencyLoggingHandler; +import com.discordsrv.common.core.logging.impl.DiscordSRVLogger; +import com.discordsrv.common.core.module.ModuleManager; +import com.discordsrv.common.core.module.type.AbstractModule; +import com.discordsrv.common.core.placeholder.PlaceholderServiceImpl; +import com.discordsrv.common.core.placeholder.context.GlobalDateFormattingContext; +import com.discordsrv.common.core.placeholder.context.GlobalTextHandlingContext; +import com.discordsrv.common.core.placeholder.format.DiscordMarkdownFormatImpl; +import com.discordsrv.common.core.placeholder.result.ComponentResultStringifier; +import com.discordsrv.common.core.storage.Storage; +import com.discordsrv.common.core.storage.StorageType; +import com.discordsrv.common.core.storage.impl.MemoryStorage; import com.discordsrv.common.discord.api.DiscordAPIEventModule; import com.discordsrv.common.discord.api.DiscordAPIImpl; import com.discordsrv.common.discord.connection.details.DiscordConnectionDetailsImpl; import com.discordsrv.common.discord.connection.jda.JDAConnectionManager; -import com.discordsrv.common.event.bus.EventBusImpl; import com.discordsrv.common.exception.StorageException; -import com.discordsrv.common.function.CheckedFunction; -import com.discordsrv.common.groupsync.GroupSyncModule; -import com.discordsrv.common.invite.DiscordInviteModule; -import com.discordsrv.common.linking.LinkProvider; -import com.discordsrv.common.linking.LinkingModule; -import com.discordsrv.common.linking.impl.MinecraftAuthenticationLinker; -import com.discordsrv.common.linking.impl.StorageLinker; -import com.discordsrv.common.logging.Logger; +import com.discordsrv.common.feature.DiscordInviteModule; +import com.discordsrv.common.feature.PresenceUpdaterModule; +import com.discordsrv.common.feature.bansync.BanSyncModule; +import com.discordsrv.common.feature.channel.ChannelLockingModule; +import com.discordsrv.common.feature.channel.TimedUpdaterModule; +import com.discordsrv.common.feature.channel.global.GlobalChannelLookupModule; +import com.discordsrv.common.feature.console.ConsoleModule; +import com.discordsrv.common.feature.debug.data.VersionInfo; +import com.discordsrv.common.feature.groupsync.GroupSyncModule; +import com.discordsrv.common.feature.linking.LinkProvider; +import com.discordsrv.common.feature.linking.LinkingModule; +import com.discordsrv.common.feature.linking.impl.MinecraftAuthenticationLinker; +import com.discordsrv.common.feature.linking.impl.StorageLinker; +import com.discordsrv.common.feature.messageforwarding.discord.DiscordChatMessageModule; +import com.discordsrv.common.feature.messageforwarding.discord.DiscordMessageMirroringModule; +import com.discordsrv.common.feature.messageforwarding.game.JoinMessageModule; +import com.discordsrv.common.feature.messageforwarding.game.LeaveMessageModule; +import com.discordsrv.common.feature.messageforwarding.game.StartMessageModule; +import com.discordsrv.common.feature.messageforwarding.game.StopMessageModule; +import com.discordsrv.common.feature.messageforwarding.game.minecrafttodiscord.MentionCachingModule; +import com.discordsrv.common.feature.profile.ProfileManager; +import com.discordsrv.common.feature.update.UpdateChecker; +import com.discordsrv.common.helper.ChannelConfigHelper; +import com.discordsrv.common.helper.DestinationLookupHelper; import com.discordsrv.common.logging.adapter.DependencyLoggerAdapter; -import com.discordsrv.common.logging.impl.DependencyLoggingHandler; -import com.discordsrv.common.logging.impl.DiscordSRVLogger; -import com.discordsrv.common.messageforwarding.discord.DiscordChatMessageModule; -import com.discordsrv.common.messageforwarding.discord.DiscordMessageMirroringModule; -import com.discordsrv.common.messageforwarding.game.JoinMessageModule; -import com.discordsrv.common.messageforwarding.game.LeaveMessageModule; -import com.discordsrv.common.messageforwarding.game.StartMessageModule; -import com.discordsrv.common.messageforwarding.game.StopMessageModule; -import com.discordsrv.common.messageforwarding.game.minecrafttodiscord.MentionCachingModule; -import com.discordsrv.common.module.ModuleManager; -import com.discordsrv.common.module.type.AbstractModule; -import com.discordsrv.common.placeholder.format.DiscordMarkdownFormatImpl; -import com.discordsrv.common.placeholder.PlaceholderServiceImpl; -import com.discordsrv.common.placeholder.context.GlobalDateFormattingContext; -import com.discordsrv.common.placeholder.context.GlobalTextHandlingContext; -import com.discordsrv.common.placeholder.result.ComponentResultStringifier; -import com.discordsrv.common.presence.PresenceUpdaterModule; -import com.discordsrv.common.profile.ProfileManager; -import com.discordsrv.common.storage.Storage; -import com.discordsrv.common.storage.StorageType; -import com.discordsrv.common.storage.impl.MemoryStorage; -import com.discordsrv.common.update.UpdateChecker; -import com.discordsrv.common.uuid.util.UUIDUtil; +import com.discordsrv.common.util.ApiInstanceUtil; +import com.discordsrv.common.util.UUIDUtil; +import com.discordsrv.common.util.function.CheckedFunction; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import net.dv8tion.jda.api.JDA; diff --git a/common/src/main/java/com/discordsrv/common/DiscordSRV.java b/common/src/main/java/com/discordsrv/common/DiscordSRV.java index cdebe390..2e49fdef 100644 --- a/common/src/main/java/com/discordsrv/common/DiscordSRV.java +++ b/common/src/main/java/com/discordsrv/common/DiscordSRV.java @@ -21,38 +21,38 @@ package com.discordsrv.common; import com.discordsrv.api.DiscordSRVApi; import com.discordsrv.api.module.Module; import com.discordsrv.api.placeholder.format.PlainPlaceholderFormat; -import com.discordsrv.common.bootstrap.IBootstrap; -import com.discordsrv.common.channel.ChannelConfigHelper; +import com.discordsrv.common.abstraction.bootstrap.IBootstrap; +import com.discordsrv.common.abstraction.player.IPlayer; +import com.discordsrv.common.abstraction.player.provider.AbstractPlayerProvider; +import com.discordsrv.common.abstraction.plugin.PluginManager; import com.discordsrv.common.command.game.GameCommandExecutionHelper; import com.discordsrv.common.command.game.handler.ICommandHandler; import com.discordsrv.common.command.game.sender.ICommandSender; -import com.discordsrv.common.component.ComponentFactory; import com.discordsrv.common.config.configurate.manager.ConnectionConfigManager; import com.discordsrv.common.config.configurate.manager.MainConfigManager; import com.discordsrv.common.config.configurate.manager.MessagesConfigManager; import com.discordsrv.common.config.connection.ConnectionConfig; import com.discordsrv.common.config.main.MainConfig; import com.discordsrv.common.config.messages.MessagesConfig; -import com.discordsrv.common.console.Console; -import com.discordsrv.common.debug.data.OnlineMode; -import com.discordsrv.common.debug.data.VersionInfo; -import com.discordsrv.common.dependency.DiscordSRVDependencyManager; -import com.discordsrv.common.destination.DestinationLookupHelper; +import com.discordsrv.common.core.component.ComponentFactory; +import com.discordsrv.common.core.dependency.DiscordSRVDependencyManager; +import com.discordsrv.common.core.logging.Logger; +import com.discordsrv.common.core.logging.impl.DiscordSRVLogger; +import com.discordsrv.common.core.module.ModuleManager; +import com.discordsrv.common.core.module.type.AbstractModule; +import com.discordsrv.common.core.placeholder.PlaceholderServiceImpl; +import com.discordsrv.common.core.scheduler.Scheduler; +import com.discordsrv.common.core.storage.Storage; import com.discordsrv.common.discord.api.DiscordAPIImpl; import com.discordsrv.common.discord.connection.details.DiscordConnectionDetailsImpl; import com.discordsrv.common.discord.connection.jda.JDAConnectionManager; -import com.discordsrv.common.linking.LinkProvider; -import com.discordsrv.common.logging.Logger; -import com.discordsrv.common.logging.impl.DiscordSRVLogger; -import com.discordsrv.common.module.ModuleManager; -import com.discordsrv.common.module.type.AbstractModule; -import com.discordsrv.common.placeholder.PlaceholderServiceImpl; -import com.discordsrv.common.player.IPlayer; -import com.discordsrv.common.player.provider.AbstractPlayerProvider; -import com.discordsrv.common.plugin.PluginManager; -import com.discordsrv.common.profile.ProfileManager; -import com.discordsrv.common.scheduler.Scheduler; -import com.discordsrv.common.storage.Storage; +import com.discordsrv.common.feature.console.Console; +import com.discordsrv.common.feature.debug.data.OnlineMode; +import com.discordsrv.common.feature.debug.data.VersionInfo; +import com.discordsrv.common.feature.linking.LinkProvider; +import com.discordsrv.common.feature.profile.ProfileManager; +import com.discordsrv.common.helper.ChannelConfigHelper; +import com.discordsrv.common.helper.DestinationLookupHelper; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.benmanes.caffeine.cache.Caffeine; import okhttp3.OkHttpClient; diff --git a/common/src/main/java/com/discordsrv/common/ProxyDiscordSRV.java b/common/src/main/java/com/discordsrv/common/ProxyDiscordSRV.java index ff47b766..c3a04165 100644 --- a/common/src/main/java/com/discordsrv/common/ProxyDiscordSRV.java +++ b/common/src/main/java/com/discordsrv/common/ProxyDiscordSRV.java @@ -18,11 +18,11 @@ package com.discordsrv.common; -import com.discordsrv.common.bootstrap.IBootstrap; +import com.discordsrv.common.abstraction.bootstrap.IBootstrap; import com.discordsrv.common.config.connection.ConnectionConfig; import com.discordsrv.common.config.main.MainConfig; import com.discordsrv.common.config.messages.MessagesConfig; -import com.discordsrv.common.messageforwarding.game.ServerSwitchMessageModule; +import com.discordsrv.common.feature.messageforwarding.game.ServerSwitchMessageModule; public abstract class ProxyDiscordSRV< B extends IBootstrap, diff --git a/common/src/main/java/com/discordsrv/common/ServerDiscordSRV.java b/common/src/main/java/com/discordsrv/common/ServerDiscordSRV.java index 72c4efdf..8f2245a5 100644 --- a/common/src/main/java/com/discordsrv/common/ServerDiscordSRV.java +++ b/common/src/main/java/com/discordsrv/common/ServerDiscordSRV.java @@ -18,14 +18,14 @@ package com.discordsrv.common; -import com.discordsrv.common.bootstrap.IBootstrap; +import com.discordsrv.common.abstraction.bootstrap.IBootstrap; +import com.discordsrv.common.abstraction.player.provider.ServerPlayerProvider; import com.discordsrv.common.config.connection.ConnectionConfig; import com.discordsrv.common.config.main.MainConfig; import com.discordsrv.common.config.messages.MessagesConfig; -import com.discordsrv.common.messageforwarding.game.AwardMessageModule; -import com.discordsrv.common.messageforwarding.game.DeathMessageModule; -import com.discordsrv.common.player.provider.ServerPlayerProvider; -import com.discordsrv.common.scheduler.ServerScheduler; +import com.discordsrv.common.core.scheduler.ServerScheduler; +import com.discordsrv.common.feature.messageforwarding.game.AwardMessageModule; +import com.discordsrv.common.feature.messageforwarding.game.DeathMessageModule; import org.jetbrains.annotations.MustBeInvokedByOverriders; import org.jetbrains.annotations.NotNull; diff --git a/common/src/main/java/com/discordsrv/common/bootstrap/IBootstrap.java b/common/src/main/java/com/discordsrv/common/abstraction/bootstrap/IBootstrap.java similarity index 91% rename from common/src/main/java/com/discordsrv/common/bootstrap/IBootstrap.java rename to common/src/main/java/com/discordsrv/common/abstraction/bootstrap/IBootstrap.java index 5603fc62..bb8a6782 100644 --- a/common/src/main/java/com/discordsrv/common/bootstrap/IBootstrap.java +++ b/common/src/main/java/com/discordsrv/common/abstraction/bootstrap/IBootstrap.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.discordsrv.common.bootstrap; +package com.discordsrv.common.abstraction.bootstrap; -import com.discordsrv.common.logging.Logger; +import com.discordsrv.common.core.logging.Logger; import dev.vankka.dependencydownload.classpath.ClasspathAppender; import java.nio.file.Path; diff --git a/common/src/main/java/com/discordsrv/common/bootstrap/LifecycleManager.java b/common/src/main/java/com/discordsrv/common/abstraction/bootstrap/LifecycleManager.java similarity index 96% rename from common/src/main/java/com/discordsrv/common/bootstrap/LifecycleManager.java rename to common/src/main/java/com/discordsrv/common/abstraction/bootstrap/LifecycleManager.java index b7fc3ae6..6befabe7 100644 --- a/common/src/main/java/com/discordsrv/common/bootstrap/LifecycleManager.java +++ b/common/src/main/java/com/discordsrv/common/abstraction/bootstrap/LifecycleManager.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package com.discordsrv.common.bootstrap; +package com.discordsrv.common.abstraction.bootstrap; import com.discordsrv.api.DiscordSRVApi; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.dependency.DependencyLoader; -import com.discordsrv.common.logging.Logger; +import com.discordsrv.common.core.dependency.DependencyLoader; +import com.discordsrv.common.core.logging.Logger; import dev.vankka.dependencydownload.classpath.ClasspathAppender; import java.io.IOException; diff --git a/common/src/main/java/com/discordsrv/common/player/IOfflinePlayer.java b/common/src/main/java/com/discordsrv/common/abstraction/player/IOfflinePlayer.java similarity index 92% rename from common/src/main/java/com/discordsrv/common/player/IOfflinePlayer.java rename to common/src/main/java/com/discordsrv/common/abstraction/player/IOfflinePlayer.java index 510ef031..ed7c9244 100644 --- a/common/src/main/java/com/discordsrv/common/player/IOfflinePlayer.java +++ b/common/src/main/java/com/discordsrv/common/abstraction/player/IOfflinePlayer.java @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package com.discordsrv.common.player; +package com.discordsrv.common.abstraction.player; import com.discordsrv.api.placeholder.annotation.Placeholder; import com.discordsrv.api.placeholder.annotation.PlaceholderPrefix; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.player.provider.model.SkinInfo; -import com.discordsrv.common.profile.Profile; +import com.discordsrv.common.abstraction.player.provider.model.SkinInfo; +import com.discordsrv.common.feature.profile.Profile; import net.kyori.adventure.identity.Identified; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/common/src/main/java/com/discordsrv/common/player/IPlayer.java b/common/src/main/java/com/discordsrv/common/abstraction/player/IPlayer.java similarity index 88% rename from common/src/main/java/com/discordsrv/common/player/IPlayer.java rename to common/src/main/java/com/discordsrv/common/abstraction/player/IPlayer.java index d0c6282f..fa36aa28 100644 --- a/common/src/main/java/com/discordsrv/common/player/IPlayer.java +++ b/common/src/main/java/com/discordsrv/common/abstraction/player/IPlayer.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.player; +package com.discordsrv.common.abstraction.player; import com.discordsrv.api.component.MinecraftComponent; import com.discordsrv.api.placeholder.annotation.Placeholder; @@ -24,10 +24,10 @@ import com.discordsrv.api.placeholder.annotation.PlaceholderPrefix; import com.discordsrv.api.player.DiscordSRVPlayer; import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.command.game.sender.ICommandSender; -import com.discordsrv.common.component.util.ComponentUtil; import com.discordsrv.common.config.main.AvatarProviderConfig; -import com.discordsrv.common.permission.util.PermissionUtil; -import com.discordsrv.common.profile.Profile; +import com.discordsrv.common.feature.profile.Profile; +import com.discordsrv.common.util.ComponentUtil; +import com.discordsrv.common.util.GamePermissionUtil; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -98,28 +98,28 @@ public interface IPlayer extends DiscordSRVPlayer, IOfflinePlayer, ICommandSende @ApiStatus.NonExtendable @Placeholder("meta_prefix") default Component getMetaPrefix() { - return PermissionUtil.getMetaPrefix(discordSRV(), uniqueId()); + return GamePermissionUtil.getMetaPrefix(discordSRV(), uniqueId()); } @Nullable @ApiStatus.NonExtendable @Placeholder("meta_suffix") default Component getMetaSuffix() { - return PermissionUtil.getMetaSuffix(discordSRV(), uniqueId()); + return GamePermissionUtil.getMetaSuffix(discordSRV(), uniqueId()); } @Nullable @ApiStatus.NonExtendable @Placeholder("prefix") default Component getPrefix() { - return PermissionUtil.getPrefix(discordSRV(), uniqueId()); + return GamePermissionUtil.getPrefix(discordSRV(), uniqueId()); } @Nullable @ApiStatus.NonExtendable @Placeholder("suffix") default Component getSuffix() { - return PermissionUtil.getSuffix(discordSRV(), uniqueId()); + return GamePermissionUtil.getSuffix(discordSRV(), uniqueId()); } } diff --git a/common/src/main/java/com/discordsrv/common/player/OfflinePlayer.java b/common/src/main/java/com/discordsrv/common/abstraction/player/OfflinePlayer.java similarity index 93% rename from common/src/main/java/com/discordsrv/common/player/OfflinePlayer.java rename to common/src/main/java/com/discordsrv/common/abstraction/player/OfflinePlayer.java index c54cf74d..b9bab18f 100644 --- a/common/src/main/java/com/discordsrv/common/player/OfflinePlayer.java +++ b/common/src/main/java/com/discordsrv/common/abstraction/player/OfflinePlayer.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.discordsrv.common.player; +package com.discordsrv.common.abstraction.player; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.player.provider.model.SkinInfo; +import com.discordsrv.common.abstraction.player.provider.model.SkinInfo; import net.kyori.adventure.identity.Identity; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/com/discordsrv/common/player/provider/AbstractPlayerProvider.java b/common/src/main/java/com/discordsrv/common/abstraction/player/provider/AbstractPlayerProvider.java similarity index 86% rename from common/src/main/java/com/discordsrv/common/player/provider/AbstractPlayerProvider.java rename to common/src/main/java/com/discordsrv/common/abstraction/player/provider/AbstractPlayerProvider.java index db9f183b..51ccb0fa 100644 --- a/common/src/main/java/com/discordsrv/common/player/provider/AbstractPlayerProvider.java +++ b/common/src/main/java/com/discordsrv/common/abstraction/player/provider/AbstractPlayerProvider.java @@ -16,20 +16,20 @@ * along with this program. If not, see . */ -package com.discordsrv.common.player.provider; +package com.discordsrv.common.abstraction.player.provider; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.event.events.player.PlayerConnectedEvent; -import com.discordsrv.common.event.events.player.PlayerDisconnectedEvent; -import com.discordsrv.common.http.util.HttpUtil; -import com.discordsrv.common.player.IOfflinePlayer; -import com.discordsrv.common.player.IPlayer; -import com.discordsrv.common.player.OfflinePlayer; -import com.discordsrv.common.player.provider.model.GameProfileResponse; -import com.discordsrv.common.player.provider.model.SkinInfo; -import com.discordsrv.common.player.provider.model.Textures; -import com.discordsrv.common.player.provider.model.UUIDResponse; -import com.discordsrv.common.uuid.util.UUIDUtil; +import com.discordsrv.common.abstraction.player.IOfflinePlayer; +import com.discordsrv.common.abstraction.player.IPlayer; +import com.discordsrv.common.abstraction.player.OfflinePlayer; +import com.discordsrv.common.abstraction.player.provider.model.GameProfileResponse; +import com.discordsrv.common.abstraction.player.provider.model.SkinInfo; +import com.discordsrv.common.abstraction.player.provider.model.Textures; +import com.discordsrv.common.abstraction.player.provider.model.UUIDResponse; +import com.discordsrv.common.events.player.PlayerConnectedEvent; +import com.discordsrv.common.events.player.PlayerDisconnectedEvent; +import com.discordsrv.common.util.HttpUtil; +import com.discordsrv.common.util.UUIDUtil; import okhttp3.Request; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/com/discordsrv/common/player/provider/PlayerProvider.java b/common/src/main/java/com/discordsrv/common/abstraction/player/provider/PlayerProvider.java similarity index 91% rename from common/src/main/java/com/discordsrv/common/player/provider/PlayerProvider.java rename to common/src/main/java/com/discordsrv/common/abstraction/player/provider/PlayerProvider.java index 4e60fab8..d7e5e17d 100644 --- a/common/src/main/java/com/discordsrv/common/player/provider/PlayerProvider.java +++ b/common/src/main/java/com/discordsrv/common/abstraction/player/provider/PlayerProvider.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package com.discordsrv.common.player.provider; +package com.discordsrv.common.abstraction.player.provider; import com.discordsrv.api.player.DiscordSRVPlayer; import com.discordsrv.api.player.IPlayerProvider; -import com.discordsrv.common.player.IOfflinePlayer; -import com.discordsrv.common.player.IPlayer; +import com.discordsrv.common.abstraction.player.IOfflinePlayer; +import com.discordsrv.common.abstraction.player.IPlayer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/com/discordsrv/common/player/provider/ServerPlayerProvider.java b/common/src/main/java/com/discordsrv/common/abstraction/player/provider/ServerPlayerProvider.java similarity index 89% rename from common/src/main/java/com/discordsrv/common/player/provider/ServerPlayerProvider.java rename to common/src/main/java/com/discordsrv/common/abstraction/player/provider/ServerPlayerProvider.java index 33d0e67a..352d273e 100644 --- a/common/src/main/java/com/discordsrv/common/player/provider/ServerPlayerProvider.java +++ b/common/src/main/java/com/discordsrv/common/abstraction/player/provider/ServerPlayerProvider.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.discordsrv.common.player.provider; +package com.discordsrv.common.abstraction.player.provider; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.player.IOfflinePlayer; -import com.discordsrv.common.player.IPlayer; +import com.discordsrv.common.abstraction.player.IOfflinePlayer; +import com.discordsrv.common.abstraction.player.IPlayer; import java.util.UUID; import java.util.concurrent.CompletableFuture; diff --git a/common/src/main/java/com/discordsrv/common/player/provider/model/GameProfileResponse.java b/common/src/main/java/com/discordsrv/common/abstraction/player/provider/model/GameProfileResponse.java similarity index 94% rename from common/src/main/java/com/discordsrv/common/player/provider/model/GameProfileResponse.java rename to common/src/main/java/com/discordsrv/common/abstraction/player/provider/model/GameProfileResponse.java index e2e15810..58b2755c 100644 --- a/common/src/main/java/com/discordsrv/common/player/provider/model/GameProfileResponse.java +++ b/common/src/main/java/com/discordsrv/common/abstraction/player/provider/model/GameProfileResponse.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.player.provider.model; +package com.discordsrv.common.abstraction.player.provider.model; import java.util.List; diff --git a/common/src/main/java/com/discordsrv/common/player/provider/model/SkinInfo.java b/common/src/main/java/com/discordsrv/common/abstraction/player/provider/model/SkinInfo.java similarity index 94% rename from common/src/main/java/com/discordsrv/common/player/provider/model/SkinInfo.java rename to common/src/main/java/com/discordsrv/common/abstraction/player/provider/model/SkinInfo.java index 4381df2b..7b9d5ef1 100644 --- a/common/src/main/java/com/discordsrv/common/player/provider/model/SkinInfo.java +++ b/common/src/main/java/com/discordsrv/common/abstraction/player/provider/model/SkinInfo.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.player.provider.model; +package com.discordsrv.common.abstraction.player.provider.model; public class SkinInfo { diff --git a/common/src/main/java/com/discordsrv/common/player/provider/model/Textures.java b/common/src/main/java/com/discordsrv/common/abstraction/player/provider/model/Textures.java similarity index 97% rename from common/src/main/java/com/discordsrv/common/player/provider/model/Textures.java rename to common/src/main/java/com/discordsrv/common/abstraction/player/provider/model/Textures.java index 778537ce..d1d9030f 100644 --- a/common/src/main/java/com/discordsrv/common/player/provider/model/Textures.java +++ b/common/src/main/java/com/discordsrv/common/abstraction/player/provider/model/Textures.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.player.provider.model; +package com.discordsrv.common.abstraction.player.provider.model; import com.discordsrv.common.DiscordSRV; diff --git a/common/src/main/java/com/discordsrv/common/player/provider/model/UUIDResponse.java b/common/src/main/java/com/discordsrv/common/abstraction/player/provider/model/UUIDResponse.java similarity index 93% rename from common/src/main/java/com/discordsrv/common/player/provider/model/UUIDResponse.java rename to common/src/main/java/com/discordsrv/common/abstraction/player/provider/model/UUIDResponse.java index 4dcd5566..9fc641ca 100644 --- a/common/src/main/java/com/discordsrv/common/player/provider/model/UUIDResponse.java +++ b/common/src/main/java/com/discordsrv/common/abstraction/player/provider/model/UUIDResponse.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.player.provider.model; +package com.discordsrv.common.abstraction.player.provider.model; public class UUIDResponse { diff --git a/common/src/main/java/com/discordsrv/common/plugin/Plugin.java b/common/src/main/java/com/discordsrv/common/abstraction/plugin/Plugin.java similarity index 97% rename from common/src/main/java/com/discordsrv/common/plugin/Plugin.java rename to common/src/main/java/com/discordsrv/common/abstraction/plugin/Plugin.java index 211a6c7d..7b9ec6ff 100644 --- a/common/src/main/java/com/discordsrv/common/plugin/Plugin.java +++ b/common/src/main/java/com/discordsrv/common/abstraction/plugin/Plugin.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.plugin; +package com.discordsrv.common.abstraction.plugin; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/common/src/main/java/com/discordsrv/common/plugin/PluginManager.java b/common/src/main/java/com/discordsrv/common/abstraction/plugin/PluginManager.java similarity index 95% rename from common/src/main/java/com/discordsrv/common/plugin/PluginManager.java rename to common/src/main/java/com/discordsrv/common/abstraction/plugin/PluginManager.java index b899a891..701f94e5 100644 --- a/common/src/main/java/com/discordsrv/common/plugin/PluginManager.java +++ b/common/src/main/java/com/discordsrv/common/abstraction/plugin/PluginManager.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.plugin; +package com.discordsrv.common.abstraction.plugin; import java.util.List; diff --git a/common/src/main/java/com/discordsrv/common/sync/AbstractSyncModule.java b/common/src/main/java/com/discordsrv/common/abstraction/sync/AbstractSyncModule.java similarity index 95% rename from common/src/main/java/com/discordsrv/common/sync/AbstractSyncModule.java rename to common/src/main/java/com/discordsrv/common/abstraction/sync/AbstractSyncModule.java index b194e836..15030f4e 100644 --- a/common/src/main/java/com/discordsrv/common/sync/AbstractSyncModule.java +++ b/common/src/main/java/com/discordsrv/common/abstraction/sync/AbstractSyncModule.java @@ -16,25 +16,25 @@ * along with this program. If not, see . */ -package com.discordsrv.common.sync; +package com.discordsrv.common.abstraction.sync; import com.discordsrv.api.DiscordSRVApi; -import com.discordsrv.api.event.bus.Subscribe; +import com.discordsrv.api.eventbus.Subscribe; import com.discordsrv.common.DiscordSRV; +import com.discordsrv.common.abstraction.player.IPlayer; +import com.discordsrv.common.abstraction.sync.cause.GenericSyncCauses; +import com.discordsrv.common.abstraction.sync.cause.ISyncCause; +import com.discordsrv.common.abstraction.sync.enums.SyncDirection; +import com.discordsrv.common.abstraction.sync.enums.SyncSide; +import com.discordsrv.common.abstraction.sync.result.GenericSyncResults; +import com.discordsrv.common.abstraction.sync.result.ISyncResult; import com.discordsrv.common.config.main.GroupSyncConfig; import com.discordsrv.common.config.main.generic.AbstractSyncConfig; -import com.discordsrv.common.event.events.player.PlayerConnectedEvent; -import com.discordsrv.common.future.util.CompletableFutureUtil; -import com.discordsrv.common.logging.NamedLogger; -import com.discordsrv.common.module.type.AbstractModule; -import com.discordsrv.common.player.IPlayer; -import com.discordsrv.common.someone.Someone; -import com.discordsrv.common.sync.cause.GenericSyncCauses; -import com.discordsrv.common.sync.cause.ISyncCause; -import com.discordsrv.common.sync.enums.SyncDirection; -import com.discordsrv.common.sync.enums.SyncSide; -import com.discordsrv.common.sync.result.GenericSyncResults; -import com.discordsrv.common.sync.result.ISyncResult; +import com.discordsrv.common.core.logging.NamedLogger; +import com.discordsrv.common.core.module.type.AbstractModule; +import com.discordsrv.common.events.player.PlayerConnectedEvent; +import com.discordsrv.common.helper.Someone; +import com.discordsrv.common.util.CompletableFutureUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/com/discordsrv/common/sync/SyncFail.java b/common/src/main/java/com/discordsrv/common/abstraction/sync/SyncFail.java similarity index 91% rename from common/src/main/java/com/discordsrv/common/sync/SyncFail.java rename to common/src/main/java/com/discordsrv/common/abstraction/sync/SyncFail.java index f3041c19..1ac9d616 100644 --- a/common/src/main/java/com/discordsrv/common/sync/SyncFail.java +++ b/common/src/main/java/com/discordsrv/common/abstraction/sync/SyncFail.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.discordsrv.common.sync; +package com.discordsrv.common.abstraction.sync; -import com.discordsrv.common.sync.result.ISyncResult; +import com.discordsrv.common.abstraction.sync.result.ISyncResult; public class SyncFail extends RuntimeException { diff --git a/common/src/main/java/com/discordsrv/common/sync/SyncSummary.java b/common/src/main/java/com/discordsrv/common/abstraction/sync/SyncSummary.java similarity index 93% rename from common/src/main/java/com/discordsrv/common/sync/SyncSummary.java rename to common/src/main/java/com/discordsrv/common/abstraction/sync/SyncSummary.java index c5fa0114..beede491 100644 --- a/common/src/main/java/com/discordsrv/common/sync/SyncSummary.java +++ b/common/src/main/java/com/discordsrv/common/abstraction/sync/SyncSummary.java @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package com.discordsrv.common.sync; +package com.discordsrv.common.abstraction.sync; import com.discordsrv.common.DiscordSRV; +import com.discordsrv.common.abstraction.sync.cause.ISyncCause; +import com.discordsrv.common.abstraction.sync.result.ISyncResult; import com.discordsrv.common.config.main.generic.AbstractSyncConfig; -import com.discordsrv.common.future.util.CompletableFutureUtil; -import com.discordsrv.common.someone.Someone; -import com.discordsrv.common.sync.cause.ISyncCause; -import com.discordsrv.common.sync.result.ISyncResult; +import com.discordsrv.common.helper.Someone; +import com.discordsrv.common.util.CompletableFutureUtil; import java.util.HashMap; import java.util.Map; diff --git a/common/src/main/java/com/discordsrv/common/sync/cause/GenericSyncCauses.java b/common/src/main/java/com/discordsrv/common/abstraction/sync/cause/GenericSyncCauses.java similarity index 95% rename from common/src/main/java/com/discordsrv/common/sync/cause/GenericSyncCauses.java rename to common/src/main/java/com/discordsrv/common/abstraction/sync/cause/GenericSyncCauses.java index 16be1b1a..9879e995 100644 --- a/common/src/main/java/com/discordsrv/common/sync/cause/GenericSyncCauses.java +++ b/common/src/main/java/com/discordsrv/common/abstraction/sync/cause/GenericSyncCauses.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.sync.cause; +package com.discordsrv.common.abstraction.sync.cause; public enum GenericSyncCauses implements ISyncCause { diff --git a/common/src/main/java/com/discordsrv/common/sync/cause/ISyncCause.java b/common/src/main/java/com/discordsrv/common/abstraction/sync/cause/ISyncCause.java similarity index 94% rename from common/src/main/java/com/discordsrv/common/sync/cause/ISyncCause.java rename to common/src/main/java/com/discordsrv/common/abstraction/sync/cause/ISyncCause.java index fee769f3..d23c0833 100644 --- a/common/src/main/java/com/discordsrv/common/sync/cause/ISyncCause.java +++ b/common/src/main/java/com/discordsrv/common/abstraction/sync/cause/ISyncCause.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.sync.cause; +package com.discordsrv.common.abstraction.sync.cause; public interface ISyncCause { } diff --git a/common/src/main/java/com/discordsrv/common/sync/enums/SyncDirection.java b/common/src/main/java/com/discordsrv/common/abstraction/sync/enums/SyncDirection.java similarity index 95% rename from common/src/main/java/com/discordsrv/common/sync/enums/SyncDirection.java rename to common/src/main/java/com/discordsrv/common/abstraction/sync/enums/SyncDirection.java index a81dd590..aecb39d5 100644 --- a/common/src/main/java/com/discordsrv/common/sync/enums/SyncDirection.java +++ b/common/src/main/java/com/discordsrv/common/abstraction/sync/enums/SyncDirection.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.sync.enums; +package com.discordsrv.common.abstraction.sync.enums; public enum SyncDirection { diff --git a/common/src/main/java/com/discordsrv/common/sync/enums/SyncSide.java b/common/src/main/java/com/discordsrv/common/abstraction/sync/enums/SyncSide.java similarity index 94% rename from common/src/main/java/com/discordsrv/common/sync/enums/SyncSide.java rename to common/src/main/java/com/discordsrv/common/abstraction/sync/enums/SyncSide.java index 5e811f23..0bfe9ff8 100644 --- a/common/src/main/java/com/discordsrv/common/sync/enums/SyncSide.java +++ b/common/src/main/java/com/discordsrv/common/abstraction/sync/enums/SyncSide.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.sync.enums; +package com.discordsrv.common.abstraction.sync.enums; public enum SyncSide { diff --git a/common/src/main/java/com/discordsrv/common/sync/result/GenericSyncResults.java b/common/src/main/java/com/discordsrv/common/abstraction/sync/result/GenericSyncResults.java similarity index 97% rename from common/src/main/java/com/discordsrv/common/sync/result/GenericSyncResults.java rename to common/src/main/java/com/discordsrv/common/abstraction/sync/result/GenericSyncResults.java index b67fbf3f..26a7fc75 100644 --- a/common/src/main/java/com/discordsrv/common/sync/result/GenericSyncResults.java +++ b/common/src/main/java/com/discordsrv/common/abstraction/sync/result/GenericSyncResults.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.sync.result; +package com.discordsrv.common.abstraction.sync.result; public enum GenericSyncResults implements ISyncResult { diff --git a/common/src/main/java/com/discordsrv/common/sync/result/ISyncResult.java b/common/src/main/java/com/discordsrv/common/abstraction/sync/result/ISyncResult.java similarity index 95% rename from common/src/main/java/com/discordsrv/common/sync/result/ISyncResult.java rename to common/src/main/java/com/discordsrv/common/abstraction/sync/result/ISyncResult.java index 51d6e8b3..97c67dc9 100644 --- a/common/src/main/java/com/discordsrv/common/sync/result/ISyncResult.java +++ b/common/src/main/java/com/discordsrv/common/abstraction/sync/result/ISyncResult.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.sync.result; +package com.discordsrv.common.abstraction.sync.result; import com.discordsrv.api.placeholder.util.Placeholders; diff --git a/common/src/main/java/com/discordsrv/common/command/combined/abstraction/CombinedCommand.java b/common/src/main/java/com/discordsrv/common/command/combined/abstraction/CombinedCommand.java index 905af966..673fec30 100644 --- a/common/src/main/java/com/discordsrv/common/command/combined/abstraction/CombinedCommand.java +++ b/common/src/main/java/com/discordsrv/common/command/combined/abstraction/CombinedCommand.java @@ -19,8 +19,8 @@ package com.discordsrv.common.command.combined.abstraction; import com.discordsrv.api.discord.entity.interaction.command.DiscordCommand; -import com.discordsrv.api.event.events.discord.interaction.command.DiscordChatInputInteractionEvent; -import com.discordsrv.api.event.events.discord.interaction.command.DiscordCommandAutoCompleteInteractionEvent; +import com.discordsrv.api.events.discord.interaction.command.DiscordChatInputInteractionEvent; +import com.discordsrv.api.events.discord.interaction.command.DiscordCommandAutoCompleteInteractionEvent; import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.command.game.abstraction.GameCommandArguments; import com.discordsrv.common.command.game.abstraction.GameCommandExecutor; diff --git a/common/src/main/java/com/discordsrv/common/command/combined/abstraction/CommandExecution.java b/common/src/main/java/com/discordsrv/common/command/combined/abstraction/CommandExecution.java index 1855386c..e59b9359 100644 --- a/common/src/main/java/com/discordsrv/common/command/combined/abstraction/CommandExecution.java +++ b/common/src/main/java/com/discordsrv/common/command/combined/abstraction/CommandExecution.java @@ -19,8 +19,8 @@ package com.discordsrv.common.command.combined.abstraction; import com.discordsrv.api.component.MinecraftComponent; -import com.discordsrv.common.component.util.ComponentUtil; import com.discordsrv.common.config.messages.MessagesConfig; +import com.discordsrv.common.util.ComponentUtil; import net.kyori.adventure.text.Component; import java.util.Arrays; diff --git a/common/src/main/java/com/discordsrv/common/command/combined/abstraction/DiscordCommandExecution.java b/common/src/main/java/com/discordsrv/common/command/combined/abstraction/DiscordCommandExecution.java index 7ad66b87..c6890da0 100644 --- a/common/src/main/java/com/discordsrv/common/command/combined/abstraction/DiscordCommandExecution.java +++ b/common/src/main/java/com/discordsrv/common/command/combined/abstraction/DiscordCommandExecution.java @@ -18,8 +18,8 @@ package com.discordsrv.common.command.combined.abstraction; -import com.discordsrv.api.event.events.discord.interaction.command.DiscordChatInputInteractionEvent; -import com.discordsrv.api.event.events.discord.interaction.command.DiscordCommandAutoCompleteInteractionEvent; +import com.discordsrv.api.events.discord.interaction.command.DiscordChatInputInteractionEvent; +import com.discordsrv.api.events.discord.interaction.command.DiscordCommandAutoCompleteInteractionEvent; import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.config.messages.MessagesConfig; import net.dv8tion.jda.api.entities.User; diff --git a/common/src/main/java/com/discordsrv/common/command/combined/abstraction/GameCommandExecution.java b/common/src/main/java/com/discordsrv/common/command/combined/abstraction/GameCommandExecution.java index bd1ac3d1..f0d8911d 100644 --- a/common/src/main/java/com/discordsrv/common/command/combined/abstraction/GameCommandExecution.java +++ b/common/src/main/java/com/discordsrv/common/command/combined/abstraction/GameCommandExecution.java @@ -19,10 +19,10 @@ package com.discordsrv.common.command.combined.abstraction; import com.discordsrv.common.DiscordSRV; +import com.discordsrv.common.abstraction.player.IPlayer; import com.discordsrv.common.command.game.abstraction.GameCommandArguments; import com.discordsrv.common.command.game.sender.ICommandSender; import com.discordsrv.common.config.messages.MessagesConfig; -import com.discordsrv.common.player.IPlayer; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.TextReplacementConfig; diff --git a/common/src/main/java/com/discordsrv/common/command/combined/commands/DebugCommand.java b/common/src/main/java/com/discordsrv/common/command/combined/commands/DebugCommand.java index abbbd239..20819882 100644 --- a/common/src/main/java/com/discordsrv/common/command/combined/commands/DebugCommand.java +++ b/common/src/main/java/com/discordsrv/common/command/combined/commands/DebugCommand.java @@ -26,12 +26,12 @@ import com.discordsrv.common.command.combined.abstraction.CombinedCommand; import com.discordsrv.common.command.combined.abstraction.CommandExecution; import com.discordsrv.common.command.combined.abstraction.Text; import com.discordsrv.common.command.game.abstraction.GameCommand; -import com.discordsrv.common.debug.DebugReport; -import com.discordsrv.common.paste.Paste; -import com.discordsrv.common.paste.PasteService; -import com.discordsrv.common.paste.service.AESEncryptedPasteService; -import com.discordsrv.common.paste.service.BytebinPasteService; -import com.discordsrv.common.permission.Permission; +import com.discordsrv.common.core.paste.Paste; +import com.discordsrv.common.core.paste.PasteService; +import com.discordsrv.common.core.paste.service.AESEncryptedPasteService; +import com.discordsrv.common.core.paste.service.BytebinPasteService; +import com.discordsrv.common.feature.debug.DebugReport; +import com.discordsrv.common.permission.game.Permission; import net.kyori.adventure.text.format.NamedTextColor; import java.nio.charset.StandardCharsets; diff --git a/common/src/main/java/com/discordsrv/common/command/combined/commands/LinkInitCommand.java b/common/src/main/java/com/discordsrv/common/command/combined/commands/LinkInitCommand.java index 66a533ac..d8ee6daa 100644 --- a/common/src/main/java/com/discordsrv/common/command/combined/commands/LinkInitCommand.java +++ b/common/src/main/java/com/discordsrv/common/command/combined/commands/LinkInitCommand.java @@ -22,21 +22,21 @@ import com.discordsrv.api.discord.entity.interaction.command.CommandOption; import com.discordsrv.api.discord.entity.interaction.command.DiscordCommand; import com.discordsrv.api.discord.entity.interaction.component.ComponentIdentifier; import com.discordsrv.common.DiscordSRV; +import com.discordsrv.common.abstraction.player.IPlayer; import com.discordsrv.common.command.combined.abstraction.CombinedCommand; import com.discordsrv.common.command.combined.abstraction.CommandExecution; import com.discordsrv.common.command.combined.abstraction.GameCommandExecution; import com.discordsrv.common.command.combined.abstraction.Text; import com.discordsrv.common.command.game.abstraction.GameCommand; import com.discordsrv.common.command.game.sender.ICommandSender; -import com.discordsrv.common.command.util.CommandUtil; -import com.discordsrv.common.component.util.ComponentUtil; import com.discordsrv.common.config.messages.MessagesConfig; -import com.discordsrv.common.linking.LinkProvider; -import com.discordsrv.common.linking.LinkStore; -import com.discordsrv.common.logging.Logger; -import com.discordsrv.common.logging.NamedLogger; -import com.discordsrv.common.permission.Permission; -import com.discordsrv.common.player.IPlayer; +import com.discordsrv.common.core.logging.Logger; +import com.discordsrv.common.core.logging.NamedLogger; +import com.discordsrv.common.feature.linking.LinkProvider; +import com.discordsrv.common.feature.linking.LinkStore; +import com.discordsrv.common.permission.game.Permission; +import com.discordsrv.common.util.CommandUtil; +import com.discordsrv.common.util.ComponentUtil; import com.github.benmanes.caffeine.cache.Cache; import net.kyori.adventure.text.format.NamedTextColor; import org.apache.commons.lang3.StringUtils; diff --git a/common/src/main/java/com/discordsrv/common/command/combined/commands/LinkedCommand.java b/common/src/main/java/com/discordsrv/common/command/combined/commands/LinkedCommand.java index a5906459..c338e81b 100644 --- a/common/src/main/java/com/discordsrv/common/command/combined/commands/LinkedCommand.java +++ b/common/src/main/java/com/discordsrv/common/command/combined/commands/LinkedCommand.java @@ -25,10 +25,10 @@ import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.command.combined.abstraction.CombinedCommand; import com.discordsrv.common.command.combined.abstraction.CommandExecution; import com.discordsrv.common.command.game.abstraction.GameCommand; -import com.discordsrv.common.command.util.CommandUtil; -import com.discordsrv.common.logging.Logger; -import com.discordsrv.common.logging.NamedLogger; -import com.discordsrv.common.permission.Permission; +import com.discordsrv.common.core.logging.Logger; +import com.discordsrv.common.core.logging.NamedLogger; +import com.discordsrv.common.permission.game.Permission; +import com.discordsrv.common.util.CommandUtil; import java.util.UUID; diff --git a/common/src/main/java/com/discordsrv/common/command/combined/commands/ResyncCommand.java b/common/src/main/java/com/discordsrv/common/command/combined/commands/ResyncCommand.java index 1c405322..12a90876 100644 --- a/common/src/main/java/com/discordsrv/common/command/combined/commands/ResyncCommand.java +++ b/common/src/main/java/com/discordsrv/common/command/combined/commands/ResyncCommand.java @@ -21,20 +21,20 @@ package com.discordsrv.common.command.combined.commands; import com.discordsrv.api.discord.entity.interaction.command.DiscordCommand; import com.discordsrv.api.discord.entity.interaction.component.ComponentIdentifier; import com.discordsrv.common.DiscordSRV; +import com.discordsrv.common.abstraction.player.IPlayer; +import com.discordsrv.common.abstraction.sync.AbstractSyncModule; +import com.discordsrv.common.abstraction.sync.SyncSummary; +import com.discordsrv.common.abstraction.sync.cause.GenericSyncCauses; +import com.discordsrv.common.abstraction.sync.result.ISyncResult; import com.discordsrv.common.command.combined.abstraction.CombinedCommand; import com.discordsrv.common.command.combined.abstraction.CommandExecution; import com.discordsrv.common.command.combined.abstraction.GameCommandExecution; import com.discordsrv.common.command.combined.abstraction.Text; import com.discordsrv.common.command.game.abstraction.GameCommand; -import com.discordsrv.common.future.util.CompletableFutureUtil; -import com.discordsrv.common.groupsync.GroupSyncModule; -import com.discordsrv.common.permission.Permission; -import com.discordsrv.common.player.IPlayer; -import com.discordsrv.common.someone.Someone; -import com.discordsrv.common.sync.AbstractSyncModule; -import com.discordsrv.common.sync.SyncSummary; -import com.discordsrv.common.sync.cause.GenericSyncCauses; -import com.discordsrv.common.sync.result.ISyncResult; +import com.discordsrv.common.feature.groupsync.GroupSyncModule; +import com.discordsrv.common.helper.Someone; +import com.discordsrv.common.permission.game.Permission; +import com.discordsrv.common.util.CompletableFutureUtil; import net.kyori.adventure.text.format.NamedTextColor; import java.util.*; diff --git a/common/src/main/java/com/discordsrv/common/command/combined/commands/UnlinkCommand.java b/common/src/main/java/com/discordsrv/common/command/combined/commands/UnlinkCommand.java index b1b4a5b1..b691ef0d 100644 --- a/common/src/main/java/com/discordsrv/common/command/combined/commands/UnlinkCommand.java +++ b/common/src/main/java/com/discordsrv/common/command/combined/commands/UnlinkCommand.java @@ -26,12 +26,12 @@ import com.discordsrv.common.command.combined.abstraction.CombinedCommand; import com.discordsrv.common.command.combined.abstraction.CommandExecution; import com.discordsrv.common.command.combined.abstraction.Text; import com.discordsrv.common.command.game.abstraction.GameCommand; -import com.discordsrv.common.command.util.CommandUtil; -import com.discordsrv.common.linking.LinkProvider; -import com.discordsrv.common.linking.LinkStore; -import com.discordsrv.common.logging.Logger; -import com.discordsrv.common.logging.NamedLogger; -import com.discordsrv.common.permission.Permission; +import com.discordsrv.common.core.logging.Logger; +import com.discordsrv.common.core.logging.NamedLogger; +import com.discordsrv.common.feature.linking.LinkProvider; +import com.discordsrv.common.feature.linking.LinkStore; +import com.discordsrv.common.permission.game.Permission; +import com.discordsrv.common.util.CommandUtil; import net.kyori.adventure.text.format.NamedTextColor; import java.util.UUID; diff --git a/common/src/main/java/com/discordsrv/common/command/combined/commands/VersionCommand.java b/common/src/main/java/com/discordsrv/common/command/combined/commands/VersionCommand.java index f21fc5e7..ffe2a3f5 100644 --- a/common/src/main/java/com/discordsrv/common/command/combined/commands/VersionCommand.java +++ b/common/src/main/java/com/discordsrv/common/command/combined/commands/VersionCommand.java @@ -26,8 +26,8 @@ import com.discordsrv.common.command.combined.abstraction.CombinedCommand; import com.discordsrv.common.command.combined.abstraction.CommandExecution; import com.discordsrv.common.command.combined.abstraction.Text; import com.discordsrv.common.command.game.abstraction.GameCommand; -import com.discordsrv.common.debug.data.VersionInfo; -import com.discordsrv.common.permission.Permission; +import com.discordsrv.common.feature.debug.data.VersionInfo; +import com.discordsrv.common.permission.game.Permission; import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.TextColor; import org.apache.commons.lang3.StringUtils; diff --git a/common/src/main/java/com/discordsrv/common/command/discord/DiscordCommandModule.java b/common/src/main/java/com/discordsrv/common/command/discord/DiscordCommandModule.java index fecf8b3f..95c916fa 100644 --- a/common/src/main/java/com/discordsrv/common/command/discord/DiscordCommandModule.java +++ b/common/src/main/java/com/discordsrv/common/command/discord/DiscordCommandModule.java @@ -18,11 +18,11 @@ package com.discordsrv.common.command.discord; -import com.discordsrv.api.event.bus.Subscribe; -import com.discordsrv.api.event.events.discord.interaction.command.CommandRegisterEvent; +import com.discordsrv.api.eventbus.Subscribe; +import com.discordsrv.api.events.discord.interaction.command.CommandRegisterEvent; import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.command.discord.commands.DiscordSRVDiscordCommand; -import com.discordsrv.common.module.type.AbstractModule; +import com.discordsrv.common.core.module.type.AbstractModule; public class DiscordCommandModule extends AbstractModule { diff --git a/common/src/main/java/com/discordsrv/common/command/discord/commands/DiscordSRVDiscordCommand.java b/common/src/main/java/com/discordsrv/common/command/discord/commands/DiscordSRVDiscordCommand.java index 0e675973..529ee283 100644 --- a/common/src/main/java/com/discordsrv/common/command/discord/commands/DiscordSRVDiscordCommand.java +++ b/common/src/main/java/com/discordsrv/common/command/discord/commands/DiscordSRVDiscordCommand.java @@ -24,7 +24,7 @@ import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.command.combined.commands.*; import com.discordsrv.common.command.discord.commands.subcommand.ExecuteCommand; import com.discordsrv.common.config.main.DiscordCommandConfig; -import com.discordsrv.common.linking.LinkStore; +import com.discordsrv.common.feature.linking.LinkStore; public class DiscordSRVDiscordCommand { diff --git a/common/src/main/java/com/discordsrv/common/command/discord/commands/subcommand/ExecuteCommand.java b/common/src/main/java/com/discordsrv/common/command/discord/commands/subcommand/ExecuteCommand.java index 4392f2f8..46a81d4f 100644 --- a/common/src/main/java/com/discordsrv/common/command/discord/commands/subcommand/ExecuteCommand.java +++ b/common/src/main/java/com/discordsrv/common/command/discord/commands/subcommand/ExecuteCommand.java @@ -25,14 +25,14 @@ import com.discordsrv.api.discord.entity.interaction.command.CommandOption; import com.discordsrv.api.discord.entity.interaction.command.DiscordCommand; import com.discordsrv.api.discord.entity.interaction.component.ComponentIdentifier; import com.discordsrv.api.discord.entity.message.SendableDiscordMessage; -import com.discordsrv.api.event.events.discord.interaction.command.DiscordChatInputInteractionEvent; -import com.discordsrv.api.event.events.discord.interaction.command.DiscordCommandAutoCompleteInteractionEvent; +import com.discordsrv.api.events.discord.interaction.command.DiscordChatInputInteractionEvent; +import com.discordsrv.api.events.discord.interaction.command.DiscordCommandAutoCompleteInteractionEvent; import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.command.game.GameCommandExecutionHelper; import com.discordsrv.common.config.main.DiscordCommandConfig; import com.discordsrv.common.config.main.generic.GameCommandExecutionConditionConfig; -import com.discordsrv.common.logging.Logger; -import com.discordsrv.common.logging.NamedLogger; +import com.discordsrv.common.core.logging.Logger; +import com.discordsrv.common.core.logging.NamedLogger; import net.dv8tion.jda.api.entities.Message; import net.kyori.adventure.text.Component; diff --git a/common/src/main/java/com/discordsrv/common/command/game/GameCommandModule.java b/common/src/main/java/com/discordsrv/common/command/game/GameCommandModule.java index d61e725c..54872f66 100644 --- a/common/src/main/java/com/discordsrv/common/command/game/GameCommandModule.java +++ b/common/src/main/java/com/discordsrv/common/command/game/GameCommandModule.java @@ -25,7 +25,7 @@ import com.discordsrv.common.command.game.abstraction.GameCommand; import com.discordsrv.common.command.game.commands.DiscordSRVGameCommand; import com.discordsrv.common.command.game.handler.ICommandHandler; import com.discordsrv.common.config.main.GameCommandConfig; -import com.discordsrv.common.module.type.AbstractModule; +import com.discordsrv.common.core.module.type.AbstractModule; import java.util.HashSet; import java.util.Set; diff --git a/common/src/main/java/com/discordsrv/common/command/game/abstraction/GameCommand.java b/common/src/main/java/com/discordsrv/common/command/game/abstraction/GameCommand.java index d8c30e23..c981b099 100644 --- a/common/src/main/java/com/discordsrv/common/command/game/abstraction/GameCommand.java +++ b/common/src/main/java/com/discordsrv/common/command/game/abstraction/GameCommand.java @@ -19,8 +19,8 @@ package com.discordsrv.common.command.game.abstraction; import com.discordsrv.common.command.game.sender.ICommandSender; -import com.discordsrv.common.function.CheckedFunction; -import com.discordsrv.common.permission.Permission; +import com.discordsrv.common.permission.game.Permission; +import com.discordsrv.common.util.function.CheckedFunction; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/common/src/main/java/com/discordsrv/common/command/game/commands/DiscordSRVGameCommand.java b/common/src/main/java/com/discordsrv/common/command/game/commands/DiscordSRVGameCommand.java index dba63bdf..b8b6e609 100644 --- a/common/src/main/java/com/discordsrv/common/command/game/commands/DiscordSRVGameCommand.java +++ b/common/src/main/java/com/discordsrv/common/command/game/commands/DiscordSRVGameCommand.java @@ -27,9 +27,9 @@ import com.discordsrv.common.command.game.abstraction.GameCommandExecutor; import com.discordsrv.common.command.game.commands.subcommand.BroadcastCommand; import com.discordsrv.common.command.game.commands.subcommand.reload.ReloadCommand; import com.discordsrv.common.command.game.sender.ICommandSender; -import com.discordsrv.common.component.util.ComponentUtil; -import com.discordsrv.common.linking.LinkStore; -import com.discordsrv.common.permission.Permission; +import com.discordsrv.common.feature.linking.LinkStore; +import com.discordsrv.common.permission.game.Permission; +import com.discordsrv.common.util.ComponentUtil; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/common/src/main/java/com/discordsrv/common/command/game/commands/subcommand/BroadcastCommand.java b/common/src/main/java/com/discordsrv/common/command/game/commands/subcommand/BroadcastCommand.java index d70ab9e3..6fe50003 100644 --- a/common/src/main/java/com/discordsrv/common/command/game/commands/subcommand/BroadcastCommand.java +++ b/common/src/main/java/com/discordsrv/common/command/game/commands/subcommand/BroadcastCommand.java @@ -28,10 +28,10 @@ import com.discordsrv.common.command.game.abstraction.GameCommandArguments; import com.discordsrv.common.command.game.abstraction.GameCommandExecutor; import com.discordsrv.common.command.game.abstraction.GameCommandSuggester; import com.discordsrv.common.command.game.sender.ICommandSender; -import com.discordsrv.common.component.util.ComponentUtil; import com.discordsrv.common.config.main.channels.base.BaseChannelConfig; import com.discordsrv.common.config.main.channels.base.IChannelConfig; -import com.discordsrv.common.permission.Permission; +import com.discordsrv.common.permission.game.Permission; +import com.discordsrv.common.util.ComponentUtil; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; diff --git a/common/src/main/java/com/discordsrv/common/command/game/commands/subcommand/reload/ReloadCommand.java b/common/src/main/java/com/discordsrv/common/command/game/commands/subcommand/reload/ReloadCommand.java index eac76165..81041c21 100644 --- a/common/src/main/java/com/discordsrv/common/command/game/commands/subcommand/reload/ReloadCommand.java +++ b/common/src/main/java/com/discordsrv/common/command/game/commands/subcommand/reload/ReloadCommand.java @@ -20,13 +20,13 @@ package com.discordsrv.common.command.game.commands.subcommand.reload; import com.discordsrv.api.DiscordSRVApi; import com.discordsrv.common.DiscordSRV; +import com.discordsrv.common.abstraction.player.IPlayer; import com.discordsrv.common.command.game.abstraction.GameCommand; import com.discordsrv.common.command.game.abstraction.GameCommandArguments; import com.discordsrv.common.command.game.abstraction.GameCommandExecutor; import com.discordsrv.common.command.game.abstraction.GameCommandSuggester; import com.discordsrv.common.command.game.sender.ICommandSender; -import com.discordsrv.common.permission.Permission; -import com.discordsrv.common.player.IPlayer; +import com.discordsrv.common.permission.game.Permission; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.event.ClickEvent; import net.kyori.adventure.text.event.HoverEvent; diff --git a/common/src/main/java/com/discordsrv/common/command/game/sender/ICommandSender.java b/common/src/main/java/com/discordsrv/common/command/game/sender/ICommandSender.java index 64d8391f..27f6f36f 100644 --- a/common/src/main/java/com/discordsrv/common/command/game/sender/ICommandSender.java +++ b/common/src/main/java/com/discordsrv/common/command/game/sender/ICommandSender.java @@ -19,7 +19,7 @@ package com.discordsrv.common.command.game.sender; import com.discordsrv.common.command.game.executor.CommandExecutor; -import com.discordsrv.common.permission.Permission; +import com.discordsrv.common.permission.game.Permission; import net.kyori.adventure.audience.ForwardingAudience; public interface ICommandSender extends ForwardingAudience.Single, CommandExecutor { diff --git a/common/src/main/java/com/discordsrv/common/config/configurate/manager/MessagesConfigManager.java b/common/src/main/java/com/discordsrv/common/config/configurate/manager/MessagesConfigManager.java index 2ed72676..8ca83e14 100644 --- a/common/src/main/java/com/discordsrv/common/config/configurate/manager/MessagesConfigManager.java +++ b/common/src/main/java/com/discordsrv/common/config/configurate/manager/MessagesConfigManager.java @@ -21,9 +21,9 @@ package com.discordsrv.common.config.configurate.manager; import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.config.main.MainConfig; import com.discordsrv.common.config.messages.MessagesConfig; +import com.discordsrv.common.core.logging.Logger; +import com.discordsrv.common.core.logging.NamedLogger; import com.discordsrv.common.exception.ConfigException; -import com.discordsrv.common.logging.Logger; -import com.discordsrv.common.logging.NamedLogger; import java.nio.file.Files; import java.nio.file.Path; diff --git a/common/src/main/java/com/discordsrv/common/config/configurate/manager/abstraction/ConfigurateConfigManager.java b/common/src/main/java/com/discordsrv/common/config/configurate/manager/abstraction/ConfigurateConfigManager.java index 05177d8b..21f744f3 100644 --- a/common/src/main/java/com/discordsrv/common/config/configurate/manager/abstraction/ConfigurateConfigManager.java +++ b/common/src/main/java/com/discordsrv/common/config/configurate/manager/abstraction/ConfigurateConfigManager.java @@ -33,9 +33,9 @@ import com.discordsrv.common.config.helper.MinecraftMessage; import com.discordsrv.common.config.main.channels.base.BaseChannelConfig; import com.discordsrv.common.config.main.channels.base.ChannelConfig; import com.discordsrv.common.config.main.channels.base.IChannelConfig; +import com.discordsrv.common.core.logging.Logger; +import com.discordsrv.common.core.logging.NamedLogger; import com.discordsrv.common.exception.ConfigException; -import com.discordsrv.common.logging.Logger; -import com.discordsrv.common.logging.NamedLogger; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.Nullable; import org.spongepowered.configurate.*; diff --git a/common/src/main/java/com/discordsrv/common/config/configurate/serializer/EnumSerializer.java b/common/src/main/java/com/discordsrv/common/config/configurate/serializer/EnumSerializer.java index 9c7fb455..3f3eafd5 100644 --- a/common/src/main/java/com/discordsrv/common/config/configurate/serializer/EnumSerializer.java +++ b/common/src/main/java/com/discordsrv/common/config/configurate/serializer/EnumSerializer.java @@ -18,7 +18,7 @@ package com.discordsrv.common.config.configurate.serializer; -import com.discordsrv.common.logging.Logger; +import com.discordsrv.common.core.logging.Logger; import io.leangen.geantyref.GenericTypeReflector; import org.jetbrains.annotations.Nullable; import org.spongepowered.configurate.ConfigurationNode; diff --git a/common/src/main/java/com/discordsrv/common/config/connection/UpdateConfig.java b/common/src/main/java/com/discordsrv/common/config/connection/UpdateConfig.java index b2a3c48b..c1ffee85 100644 --- a/common/src/main/java/com/discordsrv/common/config/connection/UpdateConfig.java +++ b/common/src/main/java/com/discordsrv/common/config/connection/UpdateConfig.java @@ -19,7 +19,7 @@ package com.discordsrv.common.config.connection; import com.discordsrv.common.config.configurate.annotation.Constants; -import com.discordsrv.common.update.UpdateChecker; +import com.discordsrv.common.feature.update.UpdateChecker; import org.spongepowered.configurate.objectmapping.ConfigSerializable; import org.spongepowered.configurate.objectmapping.meta.Comment; import org.spongepowered.configurate.objectmapping.meta.Setting; diff --git a/common/src/main/java/com/discordsrv/common/config/helper/MinecraftMessage.java b/common/src/main/java/com/discordsrv/common/config/helper/MinecraftMessage.java index b3957059..40350603 100644 --- a/common/src/main/java/com/discordsrv/common/config/helper/MinecraftMessage.java +++ b/common/src/main/java/com/discordsrv/common/config/helper/MinecraftMessage.java @@ -21,7 +21,7 @@ package com.discordsrv.common.config.helper; import com.discordsrv.api.DiscordSRVApi; import com.discordsrv.api.component.GameTextBuilder; import com.discordsrv.api.component.MinecraftComponent; -import com.discordsrv.common.component.util.ComponentUtil; +import com.discordsrv.common.util.ComponentUtil; import net.kyori.adventure.text.Component; public class MinecraftMessage { diff --git a/common/src/main/java/com/discordsrv/common/config/main/BanSyncConfig.java b/common/src/main/java/com/discordsrv/common/config/main/BanSyncConfig.java index 27a42d25..4c9bd3e2 100644 --- a/common/src/main/java/com/discordsrv/common/config/main/BanSyncConfig.java +++ b/common/src/main/java/com/discordsrv/common/config/main/BanSyncConfig.java @@ -18,8 +18,8 @@ package com.discordsrv.common.config.main; -import com.discordsrv.common.bansync.BanSyncModule; import com.discordsrv.common.config.main.generic.AbstractSyncConfig; +import com.discordsrv.common.feature.bansync.BanSyncModule; import org.spongepowered.configurate.objectmapping.ConfigSerializable; import org.spongepowered.configurate.objectmapping.meta.Comment; diff --git a/common/src/main/java/com/discordsrv/common/config/main/PresenceUpdaterConfig.java b/common/src/main/java/com/discordsrv/common/config/main/PresenceUpdaterConfig.java index da7f56a7..c796b133 100644 --- a/common/src/main/java/com/discordsrv/common/config/main/PresenceUpdaterConfig.java +++ b/common/src/main/java/com/discordsrv/common/config/main/PresenceUpdaterConfig.java @@ -19,7 +19,7 @@ package com.discordsrv.common.config.main; import com.discordsrv.common.config.configurate.annotation.Constants; -import com.discordsrv.common.logging.Logger; +import com.discordsrv.common.core.logging.Logger; import net.dv8tion.jda.api.OnlineStatus; import net.dv8tion.jda.api.entities.Activity; import org.spongepowered.configurate.objectmapping.ConfigSerializable; diff --git a/common/src/main/java/com/discordsrv/common/config/main/channels/DiscordToMinecraftChatConfig.java b/common/src/main/java/com/discordsrv/common/config/main/channels/DiscordToMinecraftChatConfig.java index 64a24ba3..5339bb33 100644 --- a/common/src/main/java/com/discordsrv/common/config/main/channels/DiscordToMinecraftChatConfig.java +++ b/common/src/main/java/com/discordsrv/common/config/main/channels/DiscordToMinecraftChatConfig.java @@ -18,8 +18,8 @@ package com.discordsrv.common.config.main.channels; -import com.discordsrv.common.config.configurate.manager.abstraction.ConfigurateConfigManager; import com.discordsrv.common.config.configurate.annotation.Untranslated; +import com.discordsrv.common.config.configurate.manager.abstraction.ConfigurateConfigManager; import com.discordsrv.common.config.main.generic.DiscordIgnoresConfig; import com.discordsrv.common.config.main.generic.MentionsConfig; import org.spongepowered.configurate.objectmapping.ConfigSerializable; diff --git a/common/src/main/java/com/discordsrv/common/config/main/channels/JoinMessageConfig.java b/common/src/main/java/com/discordsrv/common/config/main/channels/JoinMessageConfig.java index 2495295d..b0919f2c 100644 --- a/common/src/main/java/com/discordsrv/common/config/main/channels/JoinMessageConfig.java +++ b/common/src/main/java/com/discordsrv/common/config/main/channels/JoinMessageConfig.java @@ -20,10 +20,10 @@ package com.discordsrv.common.config.main.channels; import com.discordsrv.api.discord.entity.message.DiscordMessageEmbed; import com.discordsrv.api.discord.entity.message.SendableDiscordMessage; -import com.discordsrv.api.event.events.message.receive.game.JoinMessageReceiveEvent; -import com.discordsrv.common.config.configurate.manager.abstraction.ConfigurateConfigManager; +import com.discordsrv.api.events.message.receive.game.JoinMessageReceiveEvent; import com.discordsrv.common.config.configurate.annotation.Constants; import com.discordsrv.common.config.configurate.annotation.Untranslated; +import com.discordsrv.common.config.configurate.manager.abstraction.ConfigurateConfigManager; import com.discordsrv.common.config.main.generic.IMessageConfig; import org.jetbrains.annotations.Nullable; import org.spongepowered.configurate.objectmapping.ConfigSerializable; diff --git a/common/src/main/java/com/discordsrv/common/config/main/channels/LeaveMessageConfig.java b/common/src/main/java/com/discordsrv/common/config/main/channels/LeaveMessageConfig.java index 61a5c9f2..aa14d8ec 100644 --- a/common/src/main/java/com/discordsrv/common/config/main/channels/LeaveMessageConfig.java +++ b/common/src/main/java/com/discordsrv/common/config/main/channels/LeaveMessageConfig.java @@ -20,9 +20,9 @@ package com.discordsrv.common.config.main.channels; import com.discordsrv.api.discord.entity.message.DiscordMessageEmbed; import com.discordsrv.api.discord.entity.message.SendableDiscordMessage; -import com.discordsrv.common.config.configurate.manager.abstraction.ConfigurateConfigManager; import com.discordsrv.common.config.configurate.annotation.Constants; import com.discordsrv.common.config.configurate.annotation.Untranslated; +import com.discordsrv.common.config.configurate.manager.abstraction.ConfigurateConfigManager; import com.discordsrv.common.config.main.generic.IMessageConfig; import org.spongepowered.configurate.objectmapping.ConfigSerializable; import org.spongepowered.configurate.objectmapping.meta.Comment; diff --git a/common/src/main/java/com/discordsrv/common/config/main/channels/MinecraftToDiscordChatConfig.java b/common/src/main/java/com/discordsrv/common/config/main/channels/MinecraftToDiscordChatConfig.java index a6a90d62..7d144a3d 100644 --- a/common/src/main/java/com/discordsrv/common/config/main/channels/MinecraftToDiscordChatConfig.java +++ b/common/src/main/java/com/discordsrv/common/config/main/channels/MinecraftToDiscordChatConfig.java @@ -19,9 +19,9 @@ package com.discordsrv.common.config.main.channels; import com.discordsrv.api.discord.entity.message.SendableDiscordMessage; -import com.discordsrv.common.config.configurate.manager.abstraction.ConfigurateConfigManager; import com.discordsrv.common.config.configurate.annotation.DefaultOnly; import com.discordsrv.common.config.configurate.annotation.Untranslated; +import com.discordsrv.common.config.configurate.manager.abstraction.ConfigurateConfigManager; import com.discordsrv.common.config.main.generic.IMessageConfig; import org.spongepowered.configurate.objectmapping.ConfigSerializable; import org.spongepowered.configurate.objectmapping.meta.Comment; diff --git a/common/src/main/java/com/discordsrv/common/config/main/channels/StartMessageConfig.java b/common/src/main/java/com/discordsrv/common/config/main/channels/StartMessageConfig.java index 7d54274a..8338be30 100644 --- a/common/src/main/java/com/discordsrv/common/config/main/channels/StartMessageConfig.java +++ b/common/src/main/java/com/discordsrv/common/config/main/channels/StartMessageConfig.java @@ -19,8 +19,8 @@ package com.discordsrv.common.config.main.channels; import com.discordsrv.api.discord.entity.message.SendableDiscordMessage; -import com.discordsrv.common.config.configurate.manager.abstraction.ConfigurateConfigManager; import com.discordsrv.common.config.configurate.annotation.Untranslated; +import com.discordsrv.common.config.configurate.manager.abstraction.ConfigurateConfigManager; import com.discordsrv.common.config.main.generic.IMessageConfig; import org.spongepowered.configurate.objectmapping.ConfigSerializable; diff --git a/common/src/main/java/com/discordsrv/common/config/main/channels/StopMessageConfig.java b/common/src/main/java/com/discordsrv/common/config/main/channels/StopMessageConfig.java index 0157c366..ab115743 100644 --- a/common/src/main/java/com/discordsrv/common/config/main/channels/StopMessageConfig.java +++ b/common/src/main/java/com/discordsrv/common/config/main/channels/StopMessageConfig.java @@ -19,8 +19,8 @@ package com.discordsrv.common.config.main.channels; import com.discordsrv.api.discord.entity.message.SendableDiscordMessage; -import com.discordsrv.common.config.configurate.manager.abstraction.ConfigurateConfigManager; import com.discordsrv.common.config.configurate.annotation.Untranslated; +import com.discordsrv.common.config.configurate.manager.abstraction.ConfigurateConfigManager; import com.discordsrv.common.config.main.generic.IMessageConfig; import org.spongepowered.configurate.objectmapping.ConfigSerializable; diff --git a/common/src/main/java/com/discordsrv/common/config/main/channels/proxy/ServerSwitchMessageConfig.java b/common/src/main/java/com/discordsrv/common/config/main/channels/proxy/ServerSwitchMessageConfig.java index d4776506..a980c49d 100644 --- a/common/src/main/java/com/discordsrv/common/config/main/channels/proxy/ServerSwitchMessageConfig.java +++ b/common/src/main/java/com/discordsrv/common/config/main/channels/proxy/ServerSwitchMessageConfig.java @@ -20,8 +20,8 @@ package com.discordsrv.common.config.main.channels.proxy; import com.discordsrv.api.discord.entity.message.DiscordMessageEmbed; import com.discordsrv.api.discord.entity.message.SendableDiscordMessage; -import com.discordsrv.common.config.configurate.manager.abstraction.ConfigurateConfigManager; import com.discordsrv.common.config.configurate.annotation.Untranslated; +import com.discordsrv.common.config.configurate.manager.abstraction.ConfigurateConfigManager; import com.discordsrv.common.config.main.generic.IMessageConfig; import org.spongepowered.configurate.objectmapping.ConfigSerializable; diff --git a/common/src/main/java/com/discordsrv/common/config/main/channels/server/AwardMessageConfig.java b/common/src/main/java/com/discordsrv/common/config/main/channels/server/AwardMessageConfig.java index fb97851f..9bf22105 100644 --- a/common/src/main/java/com/discordsrv/common/config/main/channels/server/AwardMessageConfig.java +++ b/common/src/main/java/com/discordsrv/common/config/main/channels/server/AwardMessageConfig.java @@ -20,8 +20,8 @@ package com.discordsrv.common.config.main.channels.server; import com.discordsrv.api.discord.entity.message.DiscordMessageEmbed; import com.discordsrv.api.discord.entity.message.SendableDiscordMessage; -import com.discordsrv.common.config.configurate.manager.abstraction.ConfigurateConfigManager; import com.discordsrv.common.config.configurate.annotation.Untranslated; +import com.discordsrv.common.config.configurate.manager.abstraction.ConfigurateConfigManager; import com.discordsrv.common.config.main.generic.IMessageConfig; import org.spongepowered.configurate.objectmapping.ConfigSerializable; diff --git a/common/src/main/java/com/discordsrv/common/config/main/channels/server/DeathMessageConfig.java b/common/src/main/java/com/discordsrv/common/config/main/channels/server/DeathMessageConfig.java index 75a3fadf..2fb2786e 100644 --- a/common/src/main/java/com/discordsrv/common/config/main/channels/server/DeathMessageConfig.java +++ b/common/src/main/java/com/discordsrv/common/config/main/channels/server/DeathMessageConfig.java @@ -20,8 +20,8 @@ package com.discordsrv.common.config.main.channels.server; import com.discordsrv.api.discord.entity.message.DiscordMessageEmbed; import com.discordsrv.api.discord.entity.message.SendableDiscordMessage; -import com.discordsrv.common.config.configurate.manager.abstraction.ConfigurateConfigManager; import com.discordsrv.common.config.configurate.annotation.Untranslated; +import com.discordsrv.common.config.configurate.manager.abstraction.ConfigurateConfigManager; import com.discordsrv.common.config.main.generic.IMessageConfig; import org.spongepowered.configurate.objectmapping.ConfigSerializable; diff --git a/common/src/main/java/com/discordsrv/common/config/main/channels/server/ServerJoinMessageConfig.java b/common/src/main/java/com/discordsrv/common/config/main/channels/server/ServerJoinMessageConfig.java index ed168805..98e45ab5 100644 --- a/common/src/main/java/com/discordsrv/common/config/main/channels/server/ServerJoinMessageConfig.java +++ b/common/src/main/java/com/discordsrv/common/config/main/channels/server/ServerJoinMessageConfig.java @@ -18,8 +18,8 @@ package com.discordsrv.common.config.main.channels.server; -import com.discordsrv.common.config.configurate.manager.abstraction.ConfigurateConfigManager; import com.discordsrv.common.config.configurate.annotation.Order; +import com.discordsrv.common.config.configurate.manager.abstraction.ConfigurateConfigManager; import com.discordsrv.common.config.main.channels.JoinMessageConfig; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/com/discordsrv/common/config/main/generic/AbstractSyncConfig.java b/common/src/main/java/com/discordsrv/common/config/main/generic/AbstractSyncConfig.java index e4d0fe47..bdc9b731 100644 --- a/common/src/main/java/com/discordsrv/common/config/main/generic/AbstractSyncConfig.java +++ b/common/src/main/java/com/discordsrv/common/config/main/generic/AbstractSyncConfig.java @@ -19,9 +19,9 @@ package com.discordsrv.common.config.main.generic; import com.discordsrv.common.DiscordSRV; +import com.discordsrv.common.abstraction.sync.enums.SyncDirection; +import com.discordsrv.common.abstraction.sync.enums.SyncSide; import com.discordsrv.common.config.configurate.annotation.Constants; -import com.discordsrv.common.sync.enums.SyncDirection; -import com.discordsrv.common.sync.enums.SyncSide; import org.spongepowered.configurate.objectmapping.ConfigSerializable; import org.spongepowered.configurate.objectmapping.meta.Comment; diff --git a/common/src/main/java/com/discordsrv/common/config/messages/MessagesConfig.java b/common/src/main/java/com/discordsrv/common/config/messages/MessagesConfig.java index ed674c97..a1fa861d 100644 --- a/common/src/main/java/com/discordsrv/common/config/messages/MessagesConfig.java +++ b/common/src/main/java/com/discordsrv/common/config/messages/MessagesConfig.java @@ -21,13 +21,13 @@ package com.discordsrv.common.config.messages; import com.discordsrv.api.discord.entity.DiscordUser; import com.discordsrv.api.placeholder.provider.SinglePlaceholder; import com.discordsrv.common.DiscordSRV; +import com.discordsrv.common.abstraction.player.IOfflinePlayer; import com.discordsrv.common.command.combined.abstraction.CommandExecution; import com.discordsrv.common.config.Config; import com.discordsrv.common.config.configurate.annotation.Constants; import com.discordsrv.common.config.configurate.annotation.Untranslated; import com.discordsrv.common.config.helper.MinecraftMessage; -import com.discordsrv.common.future.util.CompletableFutureUtil; -import com.discordsrv.common.player.IOfflinePlayer; +import com.discordsrv.common.util.CompletableFutureUtil; import org.spongepowered.configurate.objectmapping.ConfigSerializable; import org.spongepowered.configurate.objectmapping.meta.Comment; diff --git a/common/src/main/java/com/discordsrv/common/component/ComponentFactory.java b/common/src/main/java/com/discordsrv/common/core/component/ComponentFactory.java similarity index 94% rename from common/src/main/java/com/discordsrv/common/component/ComponentFactory.java rename to common/src/main/java/com/discordsrv/common/core/component/ComponentFactory.java index ccc3fca7..613531fa 100644 --- a/common/src/main/java/com/discordsrv/common/component/ComponentFactory.java +++ b/common/src/main/java/com/discordsrv/common/core/component/ComponentFactory.java @@ -16,18 +16,18 @@ * along with this program. If not, see . */ -package com.discordsrv.common.component; +package com.discordsrv.common.core.component; import com.discordsrv.api.component.GameTextBuilder; import com.discordsrv.api.component.MinecraftComponent; import com.discordsrv.api.component.MinecraftComponentAdapter; import com.discordsrv.api.component.MinecraftComponentFactory; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.component.renderer.DiscordSRVMinecraftRenderer; -import com.discordsrv.common.component.translation.Translation; -import com.discordsrv.common.component.translation.TranslationRegistry; -import com.discordsrv.common.logging.Logger; -import com.discordsrv.common.logging.NamedLogger; +import com.discordsrv.common.core.component.renderer.DiscordSRVMinecraftRenderer; +import com.discordsrv.common.core.component.translation.Translation; +import com.discordsrv.common.core.component.translation.TranslationRegistry; +import com.discordsrv.common.core.logging.Logger; +import com.discordsrv.common.core.logging.NamedLogger; import dev.vankka.enhancedlegacytext.EnhancedLegacyText; import dev.vankka.mcdiscordreserializer.discord.DiscordSerializer; import dev.vankka.mcdiscordreserializer.discord.DiscordSerializerOptions; diff --git a/common/src/main/java/com/discordsrv/common/component/EnhancedTextBuilderImpl.java b/common/src/main/java/com/discordsrv/common/core/component/EnhancedTextBuilderImpl.java similarity index 97% rename from common/src/main/java/com/discordsrv/common/component/EnhancedTextBuilderImpl.java rename to common/src/main/java/com/discordsrv/common/core/component/EnhancedTextBuilderImpl.java index dc69f4eb..7e8ecd82 100644 --- a/common/src/main/java/com/discordsrv/common/component/EnhancedTextBuilderImpl.java +++ b/common/src/main/java/com/discordsrv/common/core/component/EnhancedTextBuilderImpl.java @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package com.discordsrv.common.component; +package com.discordsrv.common.core.component; import com.discordsrv.api.color.Color; import com.discordsrv.api.component.GameTextBuilder; import com.discordsrv.api.component.MinecraftComponent; import com.discordsrv.api.placeholder.PlaceholderService; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.component.util.ComponentUtil; +import com.discordsrv.common.util.ComponentUtil; import dev.vankka.enhancedlegacytext.EnhancedComponentBuilder; import dev.vankka.enhancedlegacytext.EnhancedLegacyText; import net.kyori.adventure.text.Component; diff --git a/common/src/main/java/com/discordsrv/common/component/MinecraftComponentAdapterImpl.java b/common/src/main/java/com/discordsrv/common/core/component/MinecraftComponentAdapterImpl.java similarity index 98% rename from common/src/main/java/com/discordsrv/common/component/MinecraftComponentAdapterImpl.java rename to common/src/main/java/com/discordsrv/common/core/component/MinecraftComponentAdapterImpl.java index 690b8a26..c9a5d675 100644 --- a/common/src/main/java/com/discordsrv/common/component/MinecraftComponentAdapterImpl.java +++ b/common/src/main/java/com/discordsrv/common/core/component/MinecraftComponentAdapterImpl.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.component; +package com.discordsrv.common.core.component; import com.discordsrv.api.component.MinecraftComponent; import com.discordsrv.api.component.MinecraftComponentAdapter; diff --git a/common/src/main/java/com/discordsrv/common/component/MinecraftComponentImpl.java b/common/src/main/java/com/discordsrv/common/core/component/MinecraftComponentImpl.java similarity index 97% rename from common/src/main/java/com/discordsrv/common/component/MinecraftComponentImpl.java rename to common/src/main/java/com/discordsrv/common/core/component/MinecraftComponentImpl.java index 8f0f7e23..a646ab88 100644 --- a/common/src/main/java/com/discordsrv/common/component/MinecraftComponentImpl.java +++ b/common/src/main/java/com/discordsrv/common/core/component/MinecraftComponentImpl.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.component; +package com.discordsrv.common.core.component; import com.discordsrv.api.component.MinecraftComponent; import net.kyori.adventure.text.Component; diff --git a/common/src/main/java/com/discordsrv/common/component/renderer/DiscordSRVMinecraftRenderer.java b/common/src/main/java/com/discordsrv/common/core/component/renderer/DiscordSRVMinecraftRenderer.java similarity index 97% rename from common/src/main/java/com/discordsrv/common/component/renderer/DiscordSRVMinecraftRenderer.java rename to common/src/main/java/com/discordsrv/common/core/component/renderer/DiscordSRVMinecraftRenderer.java index f66b3946..1f055d23 100644 --- a/common/src/main/java/com/discordsrv/common/component/renderer/DiscordSRVMinecraftRenderer.java +++ b/common/src/main/java/com/discordsrv/common/core/component/renderer/DiscordSRVMinecraftRenderer.java @@ -16,18 +16,18 @@ * along with this program. If not, see . */ -package com.discordsrv.common.component.renderer; +package com.discordsrv.common.core.component.renderer; import com.discordsrv.api.discord.entity.DiscordUser; import com.discordsrv.api.discord.entity.guild.DiscordCustomEmoji; import com.discordsrv.api.discord.entity.guild.DiscordGuild; import com.discordsrv.api.discord.entity.guild.DiscordGuildMember; import com.discordsrv.api.discord.entity.guild.DiscordRole; -import com.discordsrv.api.event.events.message.process.discord.DiscordChatMessageCustomEmojiRenderEvent; +import com.discordsrv.api.events.message.process.discord.DiscordChatMessageCustomEmojiRenderEvent; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.component.util.ComponentUtil; import com.discordsrv.common.config.main.channels.DiscordToMinecraftChatConfig; import com.discordsrv.common.config.main.generic.MentionsConfig; +import com.discordsrv.common.util.ComponentUtil; import dev.vankka.mcdiscordreserializer.renderer.implementation.DefaultMinecraftRenderer; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel; diff --git a/common/src/main/java/com/discordsrv/common/component/translation/StringFormatTranslation.java b/common/src/main/java/com/discordsrv/common/core/component/translation/StringFormatTranslation.java similarity index 95% rename from common/src/main/java/com/discordsrv/common/component/translation/StringFormatTranslation.java rename to common/src/main/java/com/discordsrv/common/core/component/translation/StringFormatTranslation.java index 13a12c4f..bf17e37d 100644 --- a/common/src/main/java/com/discordsrv/common/component/translation/StringFormatTranslation.java +++ b/common/src/main/java/com/discordsrv/common/core/component/translation/StringFormatTranslation.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.component.translation; +package com.discordsrv.common.core.component.translation; public class StringFormatTranslation implements Translation { diff --git a/common/src/main/java/com/discordsrv/common/component/translation/Translation.java b/common/src/main/java/com/discordsrv/common/core/component/translation/Translation.java similarity index 94% rename from common/src/main/java/com/discordsrv/common/component/translation/Translation.java rename to common/src/main/java/com/discordsrv/common/core/component/translation/Translation.java index f2de9373..b2447b20 100644 --- a/common/src/main/java/com/discordsrv/common/component/translation/Translation.java +++ b/common/src/main/java/com/discordsrv/common/core/component/translation/Translation.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.component.translation; +package com.discordsrv.common.core.component.translation; @FunctionalInterface public interface Translation { diff --git a/common/src/main/java/com/discordsrv/common/component/translation/TranslationRegistry.java b/common/src/main/java/com/discordsrv/common/core/component/translation/TranslationRegistry.java similarity index 97% rename from common/src/main/java/com/discordsrv/common/component/translation/TranslationRegistry.java rename to common/src/main/java/com/discordsrv/common/core/component/translation/TranslationRegistry.java index 50c532ee..640d1a02 100644 --- a/common/src/main/java/com/discordsrv/common/component/translation/TranslationRegistry.java +++ b/common/src/main/java/com/discordsrv/common/core/component/translation/TranslationRegistry.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.component.translation; +package com.discordsrv.common.core.component.translation; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/com/discordsrv/common/dependency/DependencyLoader.java b/common/src/main/java/com/discordsrv/common/core/dependency/DependencyLoader.java similarity index 99% rename from common/src/main/java/com/discordsrv/common/dependency/DependencyLoader.java rename to common/src/main/java/com/discordsrv/common/core/dependency/DependencyLoader.java index e78edb03..a687c48a 100644 --- a/common/src/main/java/com/discordsrv/common/dependency/DependencyLoader.java +++ b/common/src/main/java/com/discordsrv/common/core/dependency/DependencyLoader.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.dependency; +package com.discordsrv.common.core.dependency; import com.discordsrv.common.DiscordSRV; import dev.vankka.dependencydownload.DependencyManager; diff --git a/common/src/main/java/com/discordsrv/common/dependency/DiscordSRVDependencyManager.java b/common/src/main/java/com/discordsrv/common/core/dependency/DiscordSRVDependencyManager.java similarity index 98% rename from common/src/main/java/com/discordsrv/common/dependency/DiscordSRVDependencyManager.java rename to common/src/main/java/com/discordsrv/common/core/dependency/DiscordSRVDependencyManager.java index 9393b118..f6caecc9 100644 --- a/common/src/main/java/com/discordsrv/common/dependency/DiscordSRVDependencyManager.java +++ b/common/src/main/java/com/discordsrv/common/core/dependency/DiscordSRVDependencyManager.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.dependency; +package com.discordsrv.common.core.dependency; import com.discordsrv.common.DiscordSRV; import dev.vankka.dependencydownload.ApplicationDependencyManager; diff --git a/common/src/main/java/com/discordsrv/common/event/bus/EventBusImpl.java b/common/src/main/java/com/discordsrv/common/core/eventbus/EventBusImpl.java similarity index 93% rename from common/src/main/java/com/discordsrv/common/event/bus/EventBusImpl.java rename to common/src/main/java/com/discordsrv/common/core/eventbus/EventBusImpl.java index 955268e9..ff5612a7 100644 --- a/common/src/main/java/com/discordsrv/common/event/bus/EventBusImpl.java +++ b/common/src/main/java/com/discordsrv/common/core/eventbus/EventBusImpl.java @@ -16,23 +16,23 @@ * along with this program. If not, see . */ -package com.discordsrv.common.event.bus; +package com.discordsrv.common.core.eventbus; -import com.discordsrv.api.event.bus.EventBus; -import com.discordsrv.api.event.bus.EventListener; -import com.discordsrv.api.event.bus.EventPriority; -import com.discordsrv.api.event.bus.Subscribe; -import com.discordsrv.api.event.bus.internal.EventStateHolder; -import com.discordsrv.api.event.events.Cancellable; -import com.discordsrv.api.event.events.Event; -import com.discordsrv.api.event.events.Processable; +import com.discordsrv.api.eventbus.EventBus; +import com.discordsrv.api.eventbus.EventListener; +import com.discordsrv.api.eventbus.EventPriority; +import com.discordsrv.api.eventbus.Subscribe; +import com.discordsrv.api.eventbus.internal.EventStateHolder; +import com.discordsrv.api.events.Cancellable; +import com.discordsrv.api.events.Event; +import com.discordsrv.api.events.Processable; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.debug.DebugGenerateEvent; -import com.discordsrv.common.debug.file.TextDebugFile; +import com.discordsrv.common.core.logging.Logger; +import com.discordsrv.common.core.logging.NamedLogger; import com.discordsrv.common.exception.InvalidListenerMethodException; -import com.discordsrv.common.logging.Logger; -import com.discordsrv.common.logging.NamedLogger; -import com.discordsrv.common.testing.TestHelper; +import com.discordsrv.common.feature.debug.DebugGenerateEvent; +import com.discordsrv.common.feature.debug.file.TextDebugFile; +import com.discordsrv.common.helper.TestHelper; import net.dv8tion.jda.api.events.GenericEvent; import org.apache.commons.lang3.tuple.Pair; import org.jetbrains.annotations.NotNull; @@ -46,7 +46,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.function.Function; import java.util.stream.Collectors; -import static com.discordsrv.common.exception.util.ExceptionUtil.minifyException; +import static com.discordsrv.common.util.ExceptionUtil.minifyException; public class EventBusImpl implements EventBus { diff --git a/common/src/main/java/com/discordsrv/common/event/bus/EventListenerImpl.java b/common/src/main/java/com/discordsrv/common/core/eventbus/EventListenerImpl.java similarity index 92% rename from common/src/main/java/com/discordsrv/common/event/bus/EventListenerImpl.java rename to common/src/main/java/com/discordsrv/common/core/eventbus/EventListenerImpl.java index 6adc2d4e..4ef8b4ad 100644 --- a/common/src/main/java/com/discordsrv/common/event/bus/EventListenerImpl.java +++ b/common/src/main/java/com/discordsrv/common/core/eventbus/EventListenerImpl.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.discordsrv.common.event.bus; +package com.discordsrv.common.core.eventbus; -import com.discordsrv.api.event.bus.EventListener; -import com.discordsrv.api.event.bus.EventPriority; -import com.discordsrv.api.event.bus.Subscribe; +import com.discordsrv.api.eventbus.EventListener; +import com.discordsrv.api.eventbus.EventPriority; +import com.discordsrv.api.eventbus.Subscribe; import org.jetbrains.annotations.NotNull; import java.lang.reflect.Method; diff --git a/common/src/main/java/com/discordsrv/common/logging/Logger.java b/common/src/main/java/com/discordsrv/common/core/logging/Logger.java similarity index 96% rename from common/src/main/java/com/discordsrv/common/logging/Logger.java rename to common/src/main/java/com/discordsrv/common/core/logging/Logger.java index 487e76b7..9b868ded 100644 --- a/common/src/main/java/com/discordsrv/common/logging/Logger.java +++ b/common/src/main/java/com/discordsrv/common/core/logging/Logger.java @@ -16,8 +16,9 @@ * along with this program. If not, see . */ -package com.discordsrv.common.logging; +package com.discordsrv.common.core.logging; +import com.discordsrv.common.logging.LogLevel; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/com/discordsrv/common/logging/NamedLogger.java b/common/src/main/java/com/discordsrv/common/core/logging/NamedLogger.java similarity index 94% rename from common/src/main/java/com/discordsrv/common/logging/NamedLogger.java rename to common/src/main/java/com/discordsrv/common/core/logging/NamedLogger.java index 30ac4d14..3512dea3 100644 --- a/common/src/main/java/com/discordsrv/common/logging/NamedLogger.java +++ b/common/src/main/java/com/discordsrv/common/core/logging/NamedLogger.java @@ -16,9 +16,10 @@ * along with this program. If not, see . */ -package com.discordsrv.common.logging; +package com.discordsrv.common.core.logging; import com.discordsrv.common.DiscordSRV; +import com.discordsrv.common.logging.LogLevel; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/com/discordsrv/common/logging/backend/LogFilter.java b/common/src/main/java/com/discordsrv/common/core/logging/backend/LogFilter.java similarity index 95% rename from common/src/main/java/com/discordsrv/common/logging/backend/LogFilter.java rename to common/src/main/java/com/discordsrv/common/core/logging/backend/LogFilter.java index 63da6a35..ac97868c 100644 --- a/common/src/main/java/com/discordsrv/common/logging/backend/LogFilter.java +++ b/common/src/main/java/com/discordsrv/common/core/logging/backend/LogFilter.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.logging.backend; +package com.discordsrv.common.core.logging.backend; import com.discordsrv.common.logging.LogLevel; import org.jetbrains.annotations.NotNull; diff --git a/common/src/main/java/com/discordsrv/common/logging/backend/LoggingBackend.java b/common/src/main/java/com/discordsrv/common/core/logging/backend/LoggingBackend.java similarity index 95% rename from common/src/main/java/com/discordsrv/common/logging/backend/LoggingBackend.java rename to common/src/main/java/com/discordsrv/common/core/logging/backend/LoggingBackend.java index 8a26edc2..0d3bba89 100644 --- a/common/src/main/java/com/discordsrv/common/logging/backend/LoggingBackend.java +++ b/common/src/main/java/com/discordsrv/common/core/logging/backend/LoggingBackend.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.logging.backend; +package com.discordsrv.common.core.logging.backend; import com.discordsrv.common.logging.LogAppender; diff --git a/common/src/main/java/com/discordsrv/common/logging/backend/impl/JavaLoggerImpl.java b/common/src/main/java/com/discordsrv/common/core/logging/backend/impl/JavaLoggerImpl.java similarity index 96% rename from common/src/main/java/com/discordsrv/common/logging/backend/impl/JavaLoggerImpl.java rename to common/src/main/java/com/discordsrv/common/core/logging/backend/impl/JavaLoggerImpl.java index e87b96c9..4908a25e 100644 --- a/common/src/main/java/com/discordsrv/common/logging/backend/impl/JavaLoggerImpl.java +++ b/common/src/main/java/com/discordsrv/common/core/logging/backend/impl/JavaLoggerImpl.java @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package com.discordsrv.common.logging.backend.impl; +package com.discordsrv.common.core.logging.backend.impl; +import com.discordsrv.common.core.logging.Logger; +import com.discordsrv.common.core.logging.backend.LogFilter; +import com.discordsrv.common.core.logging.backend.LoggingBackend; import com.discordsrv.common.logging.LogAppender; import com.discordsrv.common.logging.LogLevel; -import com.discordsrv.common.logging.Logger; -import com.discordsrv.common.logging.backend.LogFilter; -import com.discordsrv.common.logging.backend.LoggingBackend; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/com/discordsrv/common/logging/backend/impl/Log4JLoggerImpl.java b/common/src/main/java/com/discordsrv/common/core/logging/backend/impl/Log4JLoggerImpl.java similarity index 97% rename from common/src/main/java/com/discordsrv/common/logging/backend/impl/Log4JLoggerImpl.java rename to common/src/main/java/com/discordsrv/common/core/logging/backend/impl/Log4JLoggerImpl.java index 806d2795..b1a750ce 100644 --- a/common/src/main/java/com/discordsrv/common/logging/backend/impl/Log4JLoggerImpl.java +++ b/common/src/main/java/com/discordsrv/common/core/logging/backend/impl/Log4JLoggerImpl.java @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package com.discordsrv.common.logging.backend.impl; +package com.discordsrv.common.core.logging.backend.impl; +import com.discordsrv.common.core.logging.Logger; +import com.discordsrv.common.core.logging.backend.LogFilter; +import com.discordsrv.common.core.logging.backend.LoggingBackend; import com.discordsrv.common.logging.LogAppender; import com.discordsrv.common.logging.LogLevel; -import com.discordsrv.common.logging.Logger; -import com.discordsrv.common.logging.backend.LogFilter; -import com.discordsrv.common.logging.backend.LoggingBackend; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Marker; diff --git a/common/src/main/java/com/discordsrv/common/logging/backend/impl/SLF4JLoggerImpl.java b/common/src/main/java/com/discordsrv/common/core/logging/backend/impl/SLF4JLoggerImpl.java similarity index 95% rename from common/src/main/java/com/discordsrv/common/logging/backend/impl/SLF4JLoggerImpl.java rename to common/src/main/java/com/discordsrv/common/core/logging/backend/impl/SLF4JLoggerImpl.java index 2a0b1116..9c8e6ddb 100644 --- a/common/src/main/java/com/discordsrv/common/logging/backend/impl/SLF4JLoggerImpl.java +++ b/common/src/main/java/com/discordsrv/common/core/logging/backend/impl/SLF4JLoggerImpl.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.discordsrv.common.logging.backend.impl; +package com.discordsrv.common.core.logging.backend.impl; +import com.discordsrv.common.core.logging.Logger; import com.discordsrv.common.logging.LogLevel; -import com.discordsrv.common.logging.Logger; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/com/discordsrv/common/logging/impl/DependencyLoggingHandler.java b/common/src/main/java/com/discordsrv/common/core/logging/impl/DependencyLoggingHandler.java similarity index 98% rename from common/src/main/java/com/discordsrv/common/logging/impl/DependencyLoggingHandler.java rename to common/src/main/java/com/discordsrv/common/core/logging/impl/DependencyLoggingHandler.java index 36c5f6c3..4dff2481 100644 --- a/common/src/main/java/com/discordsrv/common/logging/impl/DependencyLoggingHandler.java +++ b/common/src/main/java/com/discordsrv/common/core/logging/impl/DependencyLoggingHandler.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.logging.impl; +package com.discordsrv.common.core.logging.impl; import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.logging.LogAppender; diff --git a/common/src/main/java/com/discordsrv/common/logging/impl/DiscordSRVLogger.java b/common/src/main/java/com/discordsrv/common/core/logging/impl/DiscordSRVLogger.java similarity index 98% rename from common/src/main/java/com/discordsrv/common/logging/impl/DiscordSRVLogger.java rename to common/src/main/java/com/discordsrv/common/core/logging/impl/DiscordSRVLogger.java index 1726c5c4..f125822f 100644 --- a/common/src/main/java/com/discordsrv/common/logging/impl/DiscordSRVLogger.java +++ b/common/src/main/java/com/discordsrv/common/core/logging/impl/DiscordSRVLogger.java @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package com.discordsrv.common.logging.impl; +package com.discordsrv.common.core.logging.impl; import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.config.main.DebugConfig; import com.discordsrv.common.config.main.MainConfig; -import com.discordsrv.common.discord.util.DiscordPermissionUtil; +import com.discordsrv.common.core.logging.Logger; import com.discordsrv.common.logging.LogLevel; -import com.discordsrv.common.logging.Logger; +import com.discordsrv.common.util.DiscordPermissionUtil; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Guild; diff --git a/common/src/main/java/com/discordsrv/common/module/ModuleManager.java b/common/src/main/java/com/discordsrv/common/core/module/ModuleManager.java similarity index 94% rename from common/src/main/java/com/discordsrv/common/module/ModuleManager.java rename to common/src/main/java/com/discordsrv/common/core/module/ModuleManager.java index d1e54a23..7d606c30 100644 --- a/common/src/main/java/com/discordsrv/common/module/ModuleManager.java +++ b/common/src/main/java/com/discordsrv/common/core/module/ModuleManager.java @@ -16,27 +16,27 @@ * along with this program. If not, see . */ -package com.discordsrv.common.module; +package com.discordsrv.common.core.module; import com.discordsrv.api.DiscordSRVApi; import com.discordsrv.api.discord.connection.details.DiscordCacheFlag; import com.discordsrv.api.discord.connection.details.DiscordGatewayIntent; import com.discordsrv.api.discord.connection.details.DiscordMemberCachePolicy; -import com.discordsrv.api.event.bus.EventPriority; -import com.discordsrv.api.event.bus.Subscribe; -import com.discordsrv.api.event.events.lifecycle.DiscordSRVReadyEvent; -import com.discordsrv.api.event.events.lifecycle.DiscordSRVShuttingDownEvent; +import com.discordsrv.api.eventbus.EventPriority; +import com.discordsrv.api.eventbus.Subscribe; +import com.discordsrv.api.events.lifecycle.DiscordSRVReadyEvent; +import com.discordsrv.api.events.lifecycle.DiscordSRVShuttingDownEvent; import com.discordsrv.api.module.Module; import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.command.game.commands.subcommand.reload.ReloadResults; -import com.discordsrv.common.debug.DebugGenerateEvent; -import com.discordsrv.common.debug.file.TextDebugFile; +import com.discordsrv.common.core.logging.Logger; +import com.discordsrv.common.core.logging.NamedLogger; +import com.discordsrv.common.core.module.type.AbstractModule; +import com.discordsrv.common.core.module.type.ModuleDelegate; import com.discordsrv.common.discord.connection.jda.JDAConnectionManager; -import com.discordsrv.common.function.CheckedFunction; -import com.discordsrv.common.logging.Logger; -import com.discordsrv.common.logging.NamedLogger; -import com.discordsrv.common.module.type.AbstractModule; -import com.discordsrv.common.module.type.ModuleDelegate; +import com.discordsrv.common.feature.debug.DebugGenerateEvent; +import com.discordsrv.common.feature.debug.file.TextDebugFile; +import com.discordsrv.common.util.function.CheckedFunction; import java.util.*; import java.util.concurrent.ConcurrentHashMap; diff --git a/common/src/main/java/com/discordsrv/common/module/type/AbstractModule.java b/common/src/main/java/com/discordsrv/common/core/module/type/AbstractModule.java similarity index 94% rename from common/src/main/java/com/discordsrv/common/module/type/AbstractModule.java rename to common/src/main/java/com/discordsrv/common/core/module/type/AbstractModule.java index 1081975d..e4a6a974 100644 --- a/common/src/main/java/com/discordsrv/common/module/type/AbstractModule.java +++ b/common/src/main/java/com/discordsrv/common/core/module/type/AbstractModule.java @@ -16,16 +16,16 @@ * along with this program. If not, see . */ -package com.discordsrv.common.module.type; +package com.discordsrv.common.core.module.type; import com.discordsrv.api.discord.connection.details.DiscordCacheFlag; import com.discordsrv.api.discord.connection.details.DiscordGatewayIntent; -import com.discordsrv.api.event.events.Cancellable; -import com.discordsrv.api.event.events.Processable; +import com.discordsrv.api.events.Cancellable; +import com.discordsrv.api.events.Processable; import com.discordsrv.api.module.Module; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.event.util.EventUtil; -import com.discordsrv.common.logging.Logger; +import com.discordsrv.common.core.logging.Logger; +import com.discordsrv.common.util.EventUtil; import java.util.ArrayList; import java.util.Collection; diff --git a/common/src/main/java/com/discordsrv/common/module/type/ModuleDelegate.java b/common/src/main/java/com/discordsrv/common/core/module/type/ModuleDelegate.java similarity index 96% rename from common/src/main/java/com/discordsrv/common/module/type/ModuleDelegate.java rename to common/src/main/java/com/discordsrv/common/core/module/type/ModuleDelegate.java index 2ea40529..6d7c3747 100644 --- a/common/src/main/java/com/discordsrv/common/module/type/ModuleDelegate.java +++ b/common/src/main/java/com/discordsrv/common/core/module/type/ModuleDelegate.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.module.type; +package com.discordsrv.common.core.module.type; import com.discordsrv.api.DiscordSRVApi; import com.discordsrv.api.discord.connection.details.DiscordCacheFlag; @@ -24,7 +24,7 @@ import com.discordsrv.api.discord.connection.details.DiscordGatewayIntent; import com.discordsrv.api.discord.connection.details.DiscordMemberCachePolicy; import com.discordsrv.api.module.Module; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.logging.NamedLogger; +import com.discordsrv.common.core.logging.NamedLogger; import org.jetbrains.annotations.NotNull; import java.util.Collection; diff --git a/common/src/main/java/com/discordsrv/common/module/type/PluginIntegration.java b/common/src/main/java/com/discordsrv/common/core/module/type/PluginIntegration.java similarity index 94% rename from common/src/main/java/com/discordsrv/common/module/type/PluginIntegration.java rename to common/src/main/java/com/discordsrv/common/core/module/type/PluginIntegration.java index d37be857..9389e6bb 100644 --- a/common/src/main/java/com/discordsrv/common/module/type/PluginIntegration.java +++ b/common/src/main/java/com/discordsrv/common/core/module/type/PluginIntegration.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.discordsrv.common.module.type; +package com.discordsrv.common.core.module.type; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.logging.Logger; +import com.discordsrv.common.core.logging.Logger; import org.jetbrains.annotations.MustBeInvokedByOverriders; import org.jetbrains.annotations.NotNull; diff --git a/common/src/main/java/com/discordsrv/common/paste/Paste.java b/common/src/main/java/com/discordsrv/common/core/paste/Paste.java similarity index 97% rename from common/src/main/java/com/discordsrv/common/paste/Paste.java rename to common/src/main/java/com/discordsrv/common/core/paste/Paste.java index 0eef382d..70b5c1d0 100644 --- a/common/src/main/java/com/discordsrv/common/paste/Paste.java +++ b/common/src/main/java/com/discordsrv/common/core/paste/Paste.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.paste; +package com.discordsrv.common.core.paste; public class Paste { diff --git a/common/src/main/java/com/discordsrv/common/paste/PasteService.java b/common/src/main/java/com/discordsrv/common/core/paste/PasteService.java similarity index 95% rename from common/src/main/java/com/discordsrv/common/paste/PasteService.java rename to common/src/main/java/com/discordsrv/common/core/paste/PasteService.java index efc42902..ddf074e8 100644 --- a/common/src/main/java/com/discordsrv/common/paste/PasteService.java +++ b/common/src/main/java/com/discordsrv/common/core/paste/PasteService.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.paste; +package com.discordsrv.common.core.paste; public interface PasteService { diff --git a/common/src/main/java/com/discordsrv/common/paste/service/AESEncryptedPasteService.java b/common/src/main/java/com/discordsrv/common/core/paste/service/AESEncryptedPasteService.java similarity index 94% rename from common/src/main/java/com/discordsrv/common/paste/service/AESEncryptedPasteService.java rename to common/src/main/java/com/discordsrv/common/core/paste/service/AESEncryptedPasteService.java index fa32fdec..1b98e259 100644 --- a/common/src/main/java/com/discordsrv/common/paste/service/AESEncryptedPasteService.java +++ b/common/src/main/java/com/discordsrv/common/core/paste/service/AESEncryptedPasteService.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.discordsrv.common.paste.service; +package com.discordsrv.common.core.paste.service; -import com.discordsrv.common.paste.Paste; -import com.discordsrv.common.paste.PasteService; +import com.discordsrv.common.core.paste.Paste; +import com.discordsrv.common.core.paste.PasteService; import org.apache.commons.lang3.ArrayUtils; import javax.crypto.Cipher; diff --git a/common/src/main/java/com/discordsrv/common/paste/service/BinPasteService.java b/common/src/main/java/com/discordsrv/common/core/paste/service/BinPasteService.java similarity index 94% rename from common/src/main/java/com/discordsrv/common/paste/service/BinPasteService.java rename to common/src/main/java/com/discordsrv/common/core/paste/service/BinPasteService.java index 54fab957..8b08bc0d 100644 --- a/common/src/main/java/com/discordsrv/common/paste/service/BinPasteService.java +++ b/common/src/main/java/com/discordsrv/common/core/paste/service/BinPasteService.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.discordsrv.common.paste.service; +package com.discordsrv.common.core.paste.service; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.paste.Paste; -import com.discordsrv.common.paste.PasteService; +import com.discordsrv.common.core.paste.Paste; +import com.discordsrv.common.core.paste.PasteService; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/common/src/main/java/com/discordsrv/common/paste/service/BytebinPasteService.java b/common/src/main/java/com/discordsrv/common/core/paste/service/BytebinPasteService.java similarity index 93% rename from common/src/main/java/com/discordsrv/common/paste/service/BytebinPasteService.java rename to common/src/main/java/com/discordsrv/common/core/paste/service/BytebinPasteService.java index de0c23ba..8dc41b6d 100644 --- a/common/src/main/java/com/discordsrv/common/paste/service/BytebinPasteService.java +++ b/common/src/main/java/com/discordsrv/common/core/paste/service/BytebinPasteService.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.discordsrv.common.paste.service; +package com.discordsrv.common.core.paste.service; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.paste.Paste; -import com.discordsrv.common.paste.PasteService; +import com.discordsrv.common.core.paste.Paste; +import com.discordsrv.common.core.paste.PasteService; import com.fasterxml.jackson.databind.JsonNode; import okhttp3.*; diff --git a/common/src/main/java/com/discordsrv/common/placeholder/PlaceholderServiceImpl.java b/common/src/main/java/com/discordsrv/common/core/placeholder/PlaceholderServiceImpl.java similarity index 97% rename from common/src/main/java/com/discordsrv/common/placeholder/PlaceholderServiceImpl.java rename to common/src/main/java/com/discordsrv/common/core/placeholder/PlaceholderServiceImpl.java index e44f598c..54497e8c 100644 --- a/common/src/main/java/com/discordsrv/common/placeholder/PlaceholderServiceImpl.java +++ b/common/src/main/java/com/discordsrv/common/core/placeholder/PlaceholderServiceImpl.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.discordsrv.common.placeholder; +package com.discordsrv.common.core.placeholder; -import com.discordsrv.api.event.events.placeholder.PlaceholderLookupEvent; +import com.discordsrv.api.events.placeholder.PlaceholderLookupEvent; import com.discordsrv.api.placeholder.PlaceholderLookupResult; import com.discordsrv.api.placeholder.PlaceholderService; import com.discordsrv.api.placeholder.annotation.Placeholder; @@ -27,9 +27,9 @@ import com.discordsrv.api.placeholder.annotation.PlaceholderRemainder; import com.discordsrv.api.placeholder.mapper.PlaceholderResultMapper; import com.discordsrv.api.placeholder.provider.PlaceholderProvider; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.logging.Logger; -import com.discordsrv.common.logging.NamedLogger; -import com.discordsrv.common.placeholder.provider.AnnotationPlaceholderProvider; +import com.discordsrv.common.core.logging.Logger; +import com.discordsrv.common.core.logging.NamedLogger; +import com.discordsrv.common.core.placeholder.provider.AnnotationPlaceholderProvider; import com.github.benmanes.caffeine.cache.CacheLoader; import com.github.benmanes.caffeine.cache.LoadingCache; import org.apache.commons.lang3.StringUtils; diff --git a/common/src/main/java/com/discordsrv/common/placeholder/context/GlobalDateFormattingContext.java b/common/src/main/java/com/discordsrv/common/core/placeholder/context/GlobalDateFormattingContext.java similarity index 97% rename from common/src/main/java/com/discordsrv/common/placeholder/context/GlobalDateFormattingContext.java rename to common/src/main/java/com/discordsrv/common/core/placeholder/context/GlobalDateFormattingContext.java index 1000a330..50c811b6 100644 --- a/common/src/main/java/com/discordsrv/common/placeholder/context/GlobalDateFormattingContext.java +++ b/common/src/main/java/com/discordsrv/common/core/placeholder/context/GlobalDateFormattingContext.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.placeholder.context; +package com.discordsrv.common.core.placeholder.context; import com.discordsrv.api.placeholder.annotation.Placeholder; import com.discordsrv.api.placeholder.annotation.PlaceholderRemainder; diff --git a/common/src/main/java/com/discordsrv/common/placeholder/context/GlobalTextHandlingContext.java b/common/src/main/java/com/discordsrv/common/core/placeholder/context/GlobalTextHandlingContext.java similarity index 96% rename from common/src/main/java/com/discordsrv/common/placeholder/context/GlobalTextHandlingContext.java rename to common/src/main/java/com/discordsrv/common/core/placeholder/context/GlobalTextHandlingContext.java index db28d7f7..b476e1b9 100644 --- a/common/src/main/java/com/discordsrv/common/placeholder/context/GlobalTextHandlingContext.java +++ b/common/src/main/java/com/discordsrv/common/core/placeholder/context/GlobalTextHandlingContext.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.placeholder.context; +package com.discordsrv.common.core.placeholder.context; import com.discordsrv.api.component.MinecraftComponent; import com.discordsrv.api.placeholder.annotation.Placeholder; diff --git a/common/src/main/java/com/discordsrv/common/placeholder/format/DiscordMarkdownFormatImpl.java b/common/src/main/java/com/discordsrv/common/core/placeholder/format/DiscordMarkdownFormatImpl.java similarity index 98% rename from common/src/main/java/com/discordsrv/common/placeholder/format/DiscordMarkdownFormatImpl.java rename to common/src/main/java/com/discordsrv/common/core/placeholder/format/DiscordMarkdownFormatImpl.java index a0e6f2d5..6cf15cfd 100644 --- a/common/src/main/java/com/discordsrv/common/placeholder/format/DiscordMarkdownFormatImpl.java +++ b/common/src/main/java/com/discordsrv/common/core/placeholder/format/DiscordMarkdownFormatImpl.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.placeholder.format; +package com.discordsrv.common.core.placeholder.format; import com.discordsrv.api.placeholder.format.PlainPlaceholderFormat; import dev.vankka.mcdiscordreserializer.rules.DiscordMarkdownRules; diff --git a/common/src/main/java/com/discordsrv/common/placeholder/provider/AnnotationPlaceholderProvider.java b/common/src/main/java/com/discordsrv/common/core/placeholder/provider/AnnotationPlaceholderProvider.java similarity index 97% rename from common/src/main/java/com/discordsrv/common/placeholder/provider/AnnotationPlaceholderProvider.java rename to common/src/main/java/com/discordsrv/common/core/placeholder/provider/AnnotationPlaceholderProvider.java index 709c2115..6a8aa44c 100644 --- a/common/src/main/java/com/discordsrv/common/placeholder/provider/AnnotationPlaceholderProvider.java +++ b/common/src/main/java/com/discordsrv/common/core/placeholder/provider/AnnotationPlaceholderProvider.java @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package com.discordsrv.common.placeholder.provider; +package com.discordsrv.common.core.placeholder.provider; import com.discordsrv.api.placeholder.PlaceholderLookupResult; import com.discordsrv.api.placeholder.annotation.Placeholder; import com.discordsrv.api.placeholder.annotation.PlaceholderPrefix; import com.discordsrv.api.placeholder.annotation.PlaceholderRemainder; import com.discordsrv.api.placeholder.provider.PlaceholderProvider; -import com.discordsrv.common.placeholder.provider.util.PlaceholderMethodUtil; +import com.discordsrv.common.core.placeholder.provider.util.PlaceholderMethodUtil; import org.jetbrains.annotations.NotNull; import java.lang.reflect.Field; diff --git a/common/src/main/java/com/discordsrv/common/placeholder/provider/util/PlaceholderMethodUtil.java b/common/src/main/java/com/discordsrv/common/core/placeholder/provider/util/PlaceholderMethodUtil.java similarity index 98% rename from common/src/main/java/com/discordsrv/common/placeholder/provider/util/PlaceholderMethodUtil.java rename to common/src/main/java/com/discordsrv/common/core/placeholder/provider/util/PlaceholderMethodUtil.java index b2921b2c..045492f6 100644 --- a/common/src/main/java/com/discordsrv/common/placeholder/provider/util/PlaceholderMethodUtil.java +++ b/common/src/main/java/com/discordsrv/common/core/placeholder/provider/util/PlaceholderMethodUtil.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.placeholder.provider.util; +package com.discordsrv.common.core.placeholder.provider.util; import com.discordsrv.api.placeholder.annotation.PlaceholderRemainder; diff --git a/common/src/main/java/com/discordsrv/common/placeholder/result/ComponentResultStringifier.java b/common/src/main/java/com/discordsrv/common/core/placeholder/result/ComponentResultStringifier.java similarity index 95% rename from common/src/main/java/com/discordsrv/common/placeholder/result/ComponentResultStringifier.java rename to common/src/main/java/com/discordsrv/common/core/placeholder/result/ComponentResultStringifier.java index 47620660..e47fa05e 100644 --- a/common/src/main/java/com/discordsrv/common/placeholder/result/ComponentResultStringifier.java +++ b/common/src/main/java/com/discordsrv/common/core/placeholder/result/ComponentResultStringifier.java @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package com.discordsrv.common.placeholder.result; +package com.discordsrv.common.core.placeholder.result; import com.discordsrv.api.component.MinecraftComponent; import com.discordsrv.api.placeholder.format.FormattedText; import com.discordsrv.api.placeholder.format.PlainPlaceholderFormat; import com.discordsrv.api.placeholder.mapper.PlaceholderResultMapper; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.component.util.ComponentUtil; +import com.discordsrv.common.util.ComponentUtil; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import org.jetbrains.annotations.NotNull; diff --git a/common/src/main/java/com/discordsrv/common/scheduler/Scheduler.java b/common/src/main/java/com/discordsrv/common/core/scheduler/Scheduler.java similarity index 95% rename from common/src/main/java/com/discordsrv/common/scheduler/Scheduler.java rename to common/src/main/java/com/discordsrv/common/core/scheduler/Scheduler.java index 320784dc..90d48352 100644 --- a/common/src/main/java/com/discordsrv/common/scheduler/Scheduler.java +++ b/common/src/main/java/com/discordsrv/common/core/scheduler/Scheduler.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.discordsrv.common.scheduler; +package com.discordsrv.common.core.scheduler; -import com.discordsrv.common.function.CheckedRunnable; -import com.discordsrv.common.function.CheckedSupplier; -import com.discordsrv.common.future.util.CompletableFutureUtil; +import com.discordsrv.common.util.CompletableFutureUtil; +import com.discordsrv.common.util.function.CheckedRunnable; +import com.discordsrv.common.util.function.CheckedSupplier; import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; diff --git a/common/src/main/java/com/discordsrv/common/scheduler/ServerScheduler.java b/common/src/main/java/com/discordsrv/common/core/scheduler/ServerScheduler.java similarity index 94% rename from common/src/main/java/com/discordsrv/common/scheduler/ServerScheduler.java rename to common/src/main/java/com/discordsrv/common/core/scheduler/ServerScheduler.java index 6ead8e4d..5b5e8fa0 100644 --- a/common/src/main/java/com/discordsrv/common/scheduler/ServerScheduler.java +++ b/common/src/main/java/com/discordsrv/common/core/scheduler/ServerScheduler.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.discordsrv.common.scheduler; +package com.discordsrv.common.core.scheduler; -import com.discordsrv.common.function.CheckedRunnable; -import com.discordsrv.common.function.CheckedSupplier; -import com.discordsrv.common.future.util.CompletableFutureUtil; +import com.discordsrv.common.util.CompletableFutureUtil; +import com.discordsrv.common.util.function.CheckedRunnable; +import com.discordsrv.common.util.function.CheckedSupplier; import org.jetbrains.annotations.NotNull; import java.util.concurrent.CompletableFuture; diff --git a/common/src/main/java/com/discordsrv/common/scheduler/StandardScheduler.java b/common/src/main/java/com/discordsrv/common/core/scheduler/StandardScheduler.java similarity index 86% rename from common/src/main/java/com/discordsrv/common/scheduler/StandardScheduler.java rename to common/src/main/java/com/discordsrv/common/core/scheduler/StandardScheduler.java index 1dda2343..be3ab330 100644 --- a/common/src/main/java/com/discordsrv/common/scheduler/StandardScheduler.java +++ b/common/src/main/java/com/discordsrv/common/core/scheduler/StandardScheduler.java @@ -16,15 +16,15 @@ * along with this program. If not, see . */ -package com.discordsrv.common.scheduler; +package com.discordsrv.common.core.scheduler; -import com.discordsrv.api.event.bus.EventPriority; -import com.discordsrv.api.event.bus.Subscribe; -import com.discordsrv.api.event.events.lifecycle.DiscordSRVShuttingDownEvent; +import com.discordsrv.api.eventbus.EventPriority; +import com.discordsrv.api.eventbus.Subscribe; +import com.discordsrv.api.events.lifecycle.DiscordSRVShuttingDownEvent; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.scheduler.executor.DynamicCachingThreadPoolExecutor; -import com.discordsrv.common.scheduler.threadfactory.CountingForkJoinWorkerThreadFactory; -import com.discordsrv.common.scheduler.threadfactory.CountingThreadFactory; +import com.discordsrv.common.core.scheduler.executor.DynamicCachingThreadPoolExecutor; +import com.discordsrv.common.core.scheduler.threadfactory.CountingForkJoinWorkerThreadFactory; +import com.discordsrv.common.core.scheduler.threadfactory.CountingThreadFactory; import org.jetbrains.annotations.NotNull; import java.time.Duration; @@ -49,11 +49,11 @@ public class StandardScheduler implements Scheduler { /* Timeout */ 60, TimeUnit.SECONDS, new LinkedBlockingQueue<>(), - new CountingThreadFactory(Scheduler.THREAD_NAME_PREFIX + "Executor #%s") + new CountingThreadFactory(THREAD_NAME_PREFIX + "Executor #%s") ), new ScheduledThreadPoolExecutor( 1, /* Core pool size */ - new CountingThreadFactory(Scheduler.THREAD_NAME_PREFIX + "Scheduled Executor #%s") + new CountingThreadFactory(THREAD_NAME_PREFIX + "Scheduled Executor #%s") ), new ForkJoinPool( /* parallelism */ @@ -63,7 +63,7 @@ public class StandardScheduler implements Scheduler { /* cpu cores / 2 or at least 1 */ Math.max(1, Runtime.getRuntime().availableProcessors() - 1) ), - new CountingForkJoinWorkerThreadFactory(Scheduler.THREAD_NAME_PREFIX + "ForkJoinPool Worker #%s"), + new CountingForkJoinWorkerThreadFactory(THREAD_NAME_PREFIX + "ForkJoinPool Worker #%s"), null, false /* async mode -> FIFO */ ) diff --git a/common/src/main/java/com/discordsrv/common/scheduler/executor/DynamicCachingThreadPoolExecutor.java b/common/src/main/java/com/discordsrv/common/core/scheduler/executor/DynamicCachingThreadPoolExecutor.java similarity index 97% rename from common/src/main/java/com/discordsrv/common/scheduler/executor/DynamicCachingThreadPoolExecutor.java rename to common/src/main/java/com/discordsrv/common/core/scheduler/executor/DynamicCachingThreadPoolExecutor.java index 2add1888..556867b5 100644 --- a/common/src/main/java/com/discordsrv/common/scheduler/executor/DynamicCachingThreadPoolExecutor.java +++ b/common/src/main/java/com/discordsrv/common/core/scheduler/executor/DynamicCachingThreadPoolExecutor.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.scheduler.executor; +package com.discordsrv.common.core.scheduler.executor; import org.jetbrains.annotations.NotNull; diff --git a/common/src/main/java/com/discordsrv/common/scheduler/threadfactory/CountingFactory.java b/common/src/main/java/com/discordsrv/common/core/scheduler/threadfactory/CountingFactory.java similarity index 95% rename from common/src/main/java/com/discordsrv/common/scheduler/threadfactory/CountingFactory.java rename to common/src/main/java/com/discordsrv/common/core/scheduler/threadfactory/CountingFactory.java index e55c7288..1b43d5bb 100644 --- a/common/src/main/java/com/discordsrv/common/scheduler/threadfactory/CountingFactory.java +++ b/common/src/main/java/com/discordsrv/common/core/scheduler/threadfactory/CountingFactory.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.scheduler.threadfactory; +package com.discordsrv.common.core.scheduler.threadfactory; import java.util.concurrent.atomic.AtomicInteger; diff --git a/common/src/main/java/com/discordsrv/common/scheduler/threadfactory/CountingForkJoinWorkerThreadFactory.java b/common/src/main/java/com/discordsrv/common/core/scheduler/threadfactory/CountingForkJoinWorkerThreadFactory.java similarity index 95% rename from common/src/main/java/com/discordsrv/common/scheduler/threadfactory/CountingForkJoinWorkerThreadFactory.java rename to common/src/main/java/com/discordsrv/common/core/scheduler/threadfactory/CountingForkJoinWorkerThreadFactory.java index c4199b86..a34e1497 100644 --- a/common/src/main/java/com/discordsrv/common/scheduler/threadfactory/CountingForkJoinWorkerThreadFactory.java +++ b/common/src/main/java/com/discordsrv/common/core/scheduler/threadfactory/CountingForkJoinWorkerThreadFactory.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.scheduler.threadfactory; +package com.discordsrv.common.core.scheduler.threadfactory; import java.util.concurrent.ForkJoinPool; import java.util.concurrent.ForkJoinWorkerThread; diff --git a/common/src/main/java/com/discordsrv/common/scheduler/threadfactory/CountingThreadFactory.java b/common/src/main/java/com/discordsrv/common/core/scheduler/threadfactory/CountingThreadFactory.java similarity index 95% rename from common/src/main/java/com/discordsrv/common/scheduler/threadfactory/CountingThreadFactory.java rename to common/src/main/java/com/discordsrv/common/core/scheduler/threadfactory/CountingThreadFactory.java index 9fb6ea66..abc54675 100644 --- a/common/src/main/java/com/discordsrv/common/scheduler/threadfactory/CountingThreadFactory.java +++ b/common/src/main/java/com/discordsrv/common/core/scheduler/threadfactory/CountingThreadFactory.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.scheduler.threadfactory; +package com.discordsrv.common.core.scheduler.threadfactory; import org.jetbrains.annotations.NotNull; diff --git a/common/src/main/java/com/discordsrv/common/storage/Storage.java b/common/src/main/java/com/discordsrv/common/core/storage/Storage.java similarity index 94% rename from common/src/main/java/com/discordsrv/common/storage/Storage.java rename to common/src/main/java/com/discordsrv/common/core/storage/Storage.java index a45ec895..98368df8 100644 --- a/common/src/main/java/com/discordsrv/common/storage/Storage.java +++ b/common/src/main/java/com/discordsrv/common/core/storage/Storage.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.discordsrv.common.storage; +package com.discordsrv.common.core.storage; -import com.discordsrv.common.linking.LinkStore; +import com.discordsrv.common.feature.linking.LinkStore; import org.jetbrains.annotations.Blocking; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/com/discordsrv/common/storage/StorageType.java b/common/src/main/java/com/discordsrv/common/core/storage/StorageType.java similarity index 84% rename from common/src/main/java/com/discordsrv/common/storage/StorageType.java rename to common/src/main/java/com/discordsrv/common/core/storage/StorageType.java index d4da48b7..3542597e 100644 --- a/common/src/main/java/com/discordsrv/common/storage/StorageType.java +++ b/common/src/main/java/com/discordsrv/common/core/storage/StorageType.java @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package com.discordsrv.common.storage; +package com.discordsrv.common.core.storage; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.storage.impl.MemoryStorage; -import com.discordsrv.common.storage.impl.sql.file.H2Storage; -import com.discordsrv.common.storage.impl.sql.hikari.MariaDBStorage; -import com.discordsrv.common.storage.impl.sql.hikari.MySQLStorage; +import com.discordsrv.common.core.storage.impl.MemoryStorage; +import com.discordsrv.common.core.storage.impl.sql.file.H2Storage; +import com.discordsrv.common.core.storage.impl.sql.hikari.MariaDBStorage; +import com.discordsrv.common.core.storage.impl.sql.hikari.MySQLStorage; import java.util.function.Function; diff --git a/common/src/main/java/com/discordsrv/common/storage/impl/MemoryStorage.java b/common/src/main/java/com/discordsrv/common/core/storage/impl/MemoryStorage.java similarity index 96% rename from common/src/main/java/com/discordsrv/common/storage/impl/MemoryStorage.java rename to common/src/main/java/com/discordsrv/common/core/storage/impl/MemoryStorage.java index 35f4ec61..b963a41e 100644 --- a/common/src/main/java/com/discordsrv/common/storage/impl/MemoryStorage.java +++ b/common/src/main/java/com/discordsrv/common/core/storage/impl/MemoryStorage.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.discordsrv.common.storage.impl; +package com.discordsrv.common.core.storage.impl; -import com.discordsrv.common.storage.Storage; +import com.discordsrv.common.core.storage.Storage; import org.apache.commons.collections4.BidiMap; import org.apache.commons.collections4.bidimap.DualHashBidiMap; import org.jetbrains.annotations.NotNull; diff --git a/common/src/main/java/com/discordsrv/common/storage/impl/package-info.java b/common/src/main/java/com/discordsrv/common/core/storage/impl/package-info.java similarity index 94% rename from common/src/main/java/com/discordsrv/common/storage/impl/package-info.java rename to common/src/main/java/com/discordsrv/common/core/storage/impl/package-info.java index 0372c07b..b6637fae 100644 --- a/common/src/main/java/com/discordsrv/common/storage/impl/package-info.java +++ b/common/src/main/java/com/discordsrv/common/core/storage/impl/package-info.java @@ -16,4 +16,4 @@ * along with this program. If not, see . */ -package com.discordsrv.common.storage.impl; +package com.discordsrv.common.core.storage.impl; diff --git a/common/src/main/java/com/discordsrv/common/storage/impl/sql/SQLStorage.java b/common/src/main/java/com/discordsrv/common/core/storage/impl/sql/SQLStorage.java similarity index 96% rename from common/src/main/java/com/discordsrv/common/storage/impl/sql/SQLStorage.java rename to common/src/main/java/com/discordsrv/common/core/storage/impl/sql/SQLStorage.java index 1bdc26b4..133ddab2 100644 --- a/common/src/main/java/com/discordsrv/common/storage/impl/sql/SQLStorage.java +++ b/common/src/main/java/com/discordsrv/common/core/storage/impl/sql/SQLStorage.java @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package com.discordsrv.common.storage.impl.sql; +package com.discordsrv.common.core.storage.impl.sql; import com.discordsrv.common.DiscordSRV; +import com.discordsrv.common.core.storage.Storage; import com.discordsrv.common.exception.StorageException; -import com.discordsrv.common.function.CheckedConsumer; -import com.discordsrv.common.function.CheckedFunction; -import com.discordsrv.common.linking.LinkStore; -import com.discordsrv.common.storage.Storage; +import com.discordsrv.common.feature.linking.LinkStore; +import com.discordsrv.common.util.function.CheckedConsumer; +import com.discordsrv.common.util.function.CheckedFunction; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/com/discordsrv/common/storage/impl/sql/file/H2Storage.java b/common/src/main/java/com/discordsrv/common/core/storage/impl/sql/file/H2Storage.java similarity index 97% rename from common/src/main/java/com/discordsrv/common/storage/impl/sql/file/H2Storage.java rename to common/src/main/java/com/discordsrv/common/core/storage/impl/sql/file/H2Storage.java index fabcec55..81438ae0 100644 --- a/common/src/main/java/com/discordsrv/common/storage/impl/sql/file/H2Storage.java +++ b/common/src/main/java/com/discordsrv/common/core/storage/impl/sql/file/H2Storage.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package com.discordsrv.common.storage.impl.sql.file; +package com.discordsrv.common.core.storage.impl.sql.file; import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.config.connection.StorageConfig; +import com.discordsrv.common.core.storage.impl.sql.SQLStorage; import com.discordsrv.common.exception.StorageException; -import com.discordsrv.common.storage.impl.sql.SQLStorage; import dev.vankka.dependencydownload.classloader.IsolatedClassLoader; import java.io.IOException; diff --git a/common/src/main/java/com/discordsrv/common/storage/impl/sql/hikari/HikariStorage.java b/common/src/main/java/com/discordsrv/common/core/storage/impl/sql/hikari/HikariStorage.java similarity index 96% rename from common/src/main/java/com/discordsrv/common/storage/impl/sql/hikari/HikariStorage.java rename to common/src/main/java/com/discordsrv/common/core/storage/impl/sql/hikari/HikariStorage.java index 6b28707f..01e6e14a 100644 --- a/common/src/main/java/com/discordsrv/common/storage/impl/sql/hikari/HikariStorage.java +++ b/common/src/main/java/com/discordsrv/common/core/storage/impl/sql/hikari/HikariStorage.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package com.discordsrv.common.storage.impl.sql.hikari; +package com.discordsrv.common.core.storage.impl.sql.hikari; import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.config.connection.StorageConfig; +import com.discordsrv.common.core.storage.impl.sql.SQLStorage; import com.discordsrv.common.exception.StorageException; -import com.discordsrv.common.storage.impl.sql.SQLStorage; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; import com.zaxxer.hikari.pool.HikariPool; diff --git a/common/src/main/java/com/discordsrv/common/storage/impl/sql/hikari/MariaDBStorage.java b/common/src/main/java/com/discordsrv/common/core/storage/impl/sql/hikari/MariaDBStorage.java similarity index 97% rename from common/src/main/java/com/discordsrv/common/storage/impl/sql/hikari/MariaDBStorage.java rename to common/src/main/java/com/discordsrv/common/core/storage/impl/sql/hikari/MariaDBStorage.java index e9d66ef4..5fd6bd41 100644 --- a/common/src/main/java/com/discordsrv/common/storage/impl/sql/hikari/MariaDBStorage.java +++ b/common/src/main/java/com/discordsrv/common/core/storage/impl/sql/hikari/MariaDBStorage.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.storage.impl.sql.hikari; +package com.discordsrv.common.core.storage.impl.sql.hikari; import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.config.connection.StorageConfig; diff --git a/common/src/main/java/com/discordsrv/common/storage/impl/sql/hikari/MySQLStorage.java b/common/src/main/java/com/discordsrv/common/core/storage/impl/sql/hikari/MySQLStorage.java similarity index 98% rename from common/src/main/java/com/discordsrv/common/storage/impl/sql/hikari/MySQLStorage.java rename to common/src/main/java/com/discordsrv/common/core/storage/impl/sql/hikari/MySQLStorage.java index 58259732..5404fb1d 100644 --- a/common/src/main/java/com/discordsrv/common/storage/impl/sql/hikari/MySQLStorage.java +++ b/common/src/main/java/com/discordsrv/common/core/storage/impl/sql/hikari/MySQLStorage.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.storage.impl.sql.hikari; +package com.discordsrv.common.core.storage.impl.sql.hikari; import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.config.connection.StorageConfig; diff --git a/common/src/main/java/com/discordsrv/common/discord/api/DiscordAPIEventModule.java b/common/src/main/java/com/discordsrv/common/discord/api/DiscordAPIEventModule.java index 750e830b..4e6f614e 100644 --- a/common/src/main/java/com/discordsrv/common/discord/api/DiscordAPIEventModule.java +++ b/common/src/main/java/com/discordsrv/common/discord/api/DiscordAPIEventModule.java @@ -27,25 +27,25 @@ import com.discordsrv.api.discord.entity.interaction.command.CommandType; import com.discordsrv.api.discord.entity.interaction.command.DiscordCommand; import com.discordsrv.api.discord.entity.interaction.command.SubCommandGroup; import com.discordsrv.api.discord.entity.interaction.component.ComponentIdentifier; -import com.discordsrv.api.event.bus.Subscribe; -import com.discordsrv.api.event.events.Event; -import com.discordsrv.api.event.events.discord.interaction.DiscordModalInteractionEvent; -import com.discordsrv.api.event.events.discord.interaction.command.*; -import com.discordsrv.api.event.events.discord.interaction.component.DiscordButtonInteractionEvent; -import com.discordsrv.api.event.events.discord.interaction.component.DiscordSelectMenuInteractionEvent; -import com.discordsrv.api.event.events.discord.member.role.DiscordMemberRoleAddEvent; -import com.discordsrv.api.event.events.discord.member.role.DiscordMemberRoleRemoveEvent; -import com.discordsrv.api.event.events.discord.message.DiscordMessageDeleteEvent; -import com.discordsrv.api.event.events.discord.message.DiscordMessageReceiveEvent; -import com.discordsrv.api.event.events.discord.message.DiscordMessageUpdateEvent; +import com.discordsrv.api.eventbus.Subscribe; +import com.discordsrv.api.events.Event; +import com.discordsrv.api.events.discord.interaction.DiscordModalInteractionEvent; +import com.discordsrv.api.events.discord.interaction.command.*; +import com.discordsrv.api.events.discord.interaction.component.DiscordButtonInteractionEvent; +import com.discordsrv.api.events.discord.interaction.component.DiscordSelectMenuInteractionEvent; +import com.discordsrv.api.events.discord.member.role.DiscordMemberRoleAddEvent; +import com.discordsrv.api.events.discord.member.role.DiscordMemberRoleRemoveEvent; +import com.discordsrv.api.events.discord.message.DiscordMessageDeleteEvent; +import com.discordsrv.api.events.discord.message.DiscordMessageReceiveEvent; +import com.discordsrv.api.events.discord.message.DiscordMessageUpdateEvent; import com.discordsrv.api.module.Module; import com.discordsrv.common.DiscordSRV; +import com.discordsrv.common.core.module.type.AbstractModule; import com.discordsrv.common.discord.api.entity.component.DiscordInteractionHookImpl; import com.discordsrv.common.discord.api.entity.message.ReceivedDiscordMessageImpl; -import com.discordsrv.common.event.events.discord.interaction.command.DiscordChatInputInteractionEventImpl; -import com.discordsrv.common.event.events.discord.interaction.command.DiscordMessageContextInteractionEventImpl; -import com.discordsrv.common.event.events.discord.interaction.command.DiscordUserContextInteractionEventImpl; -import com.discordsrv.common.module.type.AbstractModule; +import com.discordsrv.common.events.discord.interaction.command.DiscordChatInputInteractionEventImpl; +import com.discordsrv.common.events.discord.interaction.command.DiscordMessageContextInteractionEventImpl; +import com.discordsrv.common.events.discord.interaction.command.DiscordUserContextInteractionEventImpl; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.events.guild.member.GuildMemberRoleAddEvent; diff --git a/common/src/main/java/com/discordsrv/common/discord/api/DiscordAPIImpl.java b/common/src/main/java/com/discordsrv/common/discord/api/DiscordAPIImpl.java index 178dbf3f..8f605a45 100644 --- a/common/src/main/java/com/discordsrv/common/discord/api/DiscordAPIImpl.java +++ b/common/src/main/java/com/discordsrv/common/discord/api/DiscordAPIImpl.java @@ -40,8 +40,8 @@ import com.discordsrv.common.discord.api.entity.guild.DiscordCustomEmojiImpl; import com.discordsrv.common.discord.api.entity.guild.DiscordGuildImpl; import com.discordsrv.common.discord.api.entity.guild.DiscordGuildMemberImpl; import com.discordsrv.common.discord.api.entity.guild.DiscordRoleImpl; -import com.discordsrv.common.function.CheckedSupplier; -import com.discordsrv.common.future.util.CompletableFutureUtil; +import com.discordsrv.common.util.CompletableFutureUtil; +import com.discordsrv.common.util.function.CheckedSupplier; import com.github.benmanes.caffeine.cache.AsyncCacheLoader; import com.github.benmanes.caffeine.cache.AsyncLoadingCache; import com.github.benmanes.caffeine.cache.Expiry; diff --git a/common/src/main/java/com/discordsrv/common/discord/api/DiscordCommandRegistry.java b/common/src/main/java/com/discordsrv/common/discord/api/DiscordCommandRegistry.java index 44213e46..7d3651a8 100644 --- a/common/src/main/java/com/discordsrv/common/discord/api/DiscordCommandRegistry.java +++ b/common/src/main/java/com/discordsrv/common/discord/api/DiscordCommandRegistry.java @@ -21,7 +21,7 @@ package com.discordsrv.common.discord.api; import com.discordsrv.api.discord.entity.JDAEntity; import com.discordsrv.api.discord.entity.interaction.command.CommandType; import com.discordsrv.api.discord.entity.interaction.command.DiscordCommand; -import com.discordsrv.api.event.events.discord.interaction.command.CommandRegisterEvent; +import com.discordsrv.api.events.discord.interaction.command.CommandRegisterEvent; import com.discordsrv.common.DiscordSRV; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.entities.Guild; diff --git a/common/src/main/java/com/discordsrv/common/discord/api/entity/message/ReceivedDiscordMessageClusterImpl.java b/common/src/main/java/com/discordsrv/common/discord/api/entity/message/ReceivedDiscordMessageClusterImpl.java index 15b1c4c5..d023c8de 100644 --- a/common/src/main/java/com/discordsrv/common/discord/api/entity/message/ReceivedDiscordMessageClusterImpl.java +++ b/common/src/main/java/com/discordsrv/common/discord/api/entity/message/ReceivedDiscordMessageClusterImpl.java @@ -21,7 +21,7 @@ package com.discordsrv.common.discord.api.entity.message; import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessage; import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster; import com.discordsrv.api.discord.entity.message.SendableDiscordMessage; -import com.discordsrv.common.future.util.CompletableFutureUtil; +import com.discordsrv.common.util.CompletableFutureUtil; import org.jetbrains.annotations.NotNull; import java.util.*; diff --git a/common/src/main/java/com/discordsrv/common/discord/api/entity/message/ReceivedDiscordMessageImpl.java b/common/src/main/java/com/discordsrv/common/discord/api/entity/message/ReceivedDiscordMessageImpl.java index 0676dd3d..4b15d560 100644 --- a/common/src/main/java/com/discordsrv/common/discord/api/entity/message/ReceivedDiscordMessageImpl.java +++ b/common/src/main/java/com/discordsrv/common/discord/api/entity/message/ReceivedDiscordMessageImpl.java @@ -33,9 +33,9 @@ import com.discordsrv.api.placeholder.annotation.Placeholder; import com.discordsrv.api.placeholder.annotation.PlaceholderPrefix; import com.discordsrv.api.placeholder.annotation.PlaceholderRemainder; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.component.util.ComponentUtil; import com.discordsrv.common.config.main.channels.base.BaseChannelConfig; -import com.discordsrv.common.future.util.CompletableFutureUtil; +import com.discordsrv.common.util.CompletableFutureUtil; +import com.discordsrv.common.util.ComponentUtil; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.MessageEmbed; diff --git a/common/src/main/java/com/discordsrv/common/discord/connection/details/DiscordConnectionDetailsImpl.java b/common/src/main/java/com/discordsrv/common/discord/connection/details/DiscordConnectionDetailsImpl.java index 1c2b13c7..f3dd5b42 100644 --- a/common/src/main/java/com/discordsrv/common/discord/connection/details/DiscordConnectionDetailsImpl.java +++ b/common/src/main/java/com/discordsrv/common/discord/connection/details/DiscordConnectionDetailsImpl.java @@ -23,7 +23,7 @@ import com.discordsrv.api.discord.connection.details.DiscordConnectionDetails; import com.discordsrv.api.discord.connection.details.DiscordGatewayIntent; import com.discordsrv.api.discord.connection.details.DiscordMemberCachePolicy; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.exception.util.ExceptionUtil; +import com.discordsrv.common.util.ExceptionUtil; import org.jetbrains.annotations.NotNull; import java.util.*; diff --git a/common/src/main/java/com/discordsrv/common/discord/connection/jda/JDAConnectionManager.java b/common/src/main/java/com/discordsrv/common/discord/connection/jda/JDAConnectionManager.java index 0fffc2e7..75cc39e2 100644 --- a/common/src/main/java/com/discordsrv/common/discord/connection/jda/JDAConnectionManager.java +++ b/common/src/main/java/com/discordsrv/common/discord/connection/jda/JDAConnectionManager.java @@ -25,27 +25,27 @@ import com.discordsrv.api.discord.connection.details.DiscordMemberCachePolicy; import com.discordsrv.api.discord.connection.jda.errorresponse.ErrorCallbackContext; import com.discordsrv.api.discord.entity.DiscordUser; import com.discordsrv.api.discord.entity.guild.DiscordGuildMember; -import com.discordsrv.api.event.bus.EventPriority; -import com.discordsrv.api.event.bus.Subscribe; -import com.discordsrv.api.event.events.lifecycle.DiscordSRVShuttingDownEvent; -import com.discordsrv.api.event.events.placeholder.PlaceholderLookupEvent; +import com.discordsrv.api.eventbus.EventPriority; +import com.discordsrv.api.eventbus.Subscribe; +import com.discordsrv.api.events.lifecycle.DiscordSRVShuttingDownEvent; +import com.discordsrv.api.events.placeholder.PlaceholderLookupEvent; import com.discordsrv.api.placeholder.PlaceholderLookupResult; import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.config.connection.BotConfig; import com.discordsrv.common.config.connection.ConnectionConfig; import com.discordsrv.common.config.documentation.DocumentationURLs; import com.discordsrv.common.config.main.MemberCachingConfig; -import com.discordsrv.common.debug.DebugGenerateEvent; -import com.discordsrv.common.debug.file.TextDebugFile; +import com.discordsrv.common.core.logging.Logger; +import com.discordsrv.common.core.logging.NamedLogger; +import com.discordsrv.common.core.scheduler.Scheduler; +import com.discordsrv.common.core.scheduler.threadfactory.CountingThreadFactory; import com.discordsrv.common.discord.api.DiscordAPIImpl; import com.discordsrv.common.discord.api.entity.message.ReceivedDiscordMessageImpl; import com.discordsrv.common.discord.connection.DiscordConnectionManager; import com.discordsrv.common.discord.connection.details.DiscordConnectionDetailsImpl; -import com.discordsrv.common.logging.Logger; -import com.discordsrv.common.logging.NamedLogger; -import com.discordsrv.common.scheduler.Scheduler; -import com.discordsrv.common.scheduler.threadfactory.CountingThreadFactory; -import com.discordsrv.common.time.util.Timeout; +import com.discordsrv.common.feature.debug.DebugGenerateEvent; +import com.discordsrv.common.feature.debug.file.TextDebugFile; +import com.discordsrv.common.helper.Timeout; import com.neovisionaries.ws.client.WebSocketFactory; import com.neovisionaries.ws.client.WebSocketFrame; import net.dv8tion.jda.api.JDA; diff --git a/common/src/main/java/com/discordsrv/common/event/events/discord/interaction/command/DiscordChatInputInteractionEventImpl.java b/common/src/main/java/com/discordsrv/common/events/discord/interaction/command/DiscordChatInputInteractionEventImpl.java similarity index 93% rename from common/src/main/java/com/discordsrv/common/event/events/discord/interaction/command/DiscordChatInputInteractionEventImpl.java rename to common/src/main/java/com/discordsrv/common/events/discord/interaction/command/DiscordChatInputInteractionEventImpl.java index b81d8473..d855a59e 100644 --- a/common/src/main/java/com/discordsrv/common/event/events/discord/interaction/command/DiscordChatInputInteractionEventImpl.java +++ b/common/src/main/java/com/discordsrv/common/events/discord/interaction/command/DiscordChatInputInteractionEventImpl.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.event.events.discord.interaction.command; +package com.discordsrv.common.events.discord.interaction.command; import com.discordsrv.api.discord.entity.DiscordUser; import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel; @@ -24,7 +24,7 @@ import com.discordsrv.api.discord.entity.guild.DiscordGuildMember; import com.discordsrv.api.discord.entity.interaction.DiscordInteractionHook; import com.discordsrv.api.discord.entity.interaction.component.ComponentIdentifier; import com.discordsrv.api.discord.entity.message.SendableDiscordMessage; -import com.discordsrv.api.event.events.discord.interaction.command.DiscordChatInputInteractionEvent; +import com.discordsrv.api.events.discord.interaction.command.DiscordChatInputInteractionEvent; import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.discord.api.entity.component.DiscordInteractionHookImpl; import com.discordsrv.common.discord.api.entity.message.util.SendableDiscordMessageUtil; diff --git a/common/src/main/java/com/discordsrv/common/event/events/discord/interaction/command/DiscordMessageContextInteractionEventImpl.java b/common/src/main/java/com/discordsrv/common/events/discord/interaction/command/DiscordMessageContextInteractionEventImpl.java similarity index 93% rename from common/src/main/java/com/discordsrv/common/event/events/discord/interaction/command/DiscordMessageContextInteractionEventImpl.java rename to common/src/main/java/com/discordsrv/common/events/discord/interaction/command/DiscordMessageContextInteractionEventImpl.java index ada00074..9798eefa 100644 --- a/common/src/main/java/com/discordsrv/common/event/events/discord/interaction/command/DiscordMessageContextInteractionEventImpl.java +++ b/common/src/main/java/com/discordsrv/common/events/discord/interaction/command/DiscordMessageContextInteractionEventImpl.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.event.events.discord.interaction.command; +package com.discordsrv.common.events.discord.interaction.command; import com.discordsrv.api.discord.entity.DiscordUser; import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel; @@ -24,7 +24,7 @@ import com.discordsrv.api.discord.entity.guild.DiscordGuildMember; import com.discordsrv.api.discord.entity.interaction.DiscordInteractionHook; import com.discordsrv.api.discord.entity.interaction.component.ComponentIdentifier; import com.discordsrv.api.discord.entity.message.SendableDiscordMessage; -import com.discordsrv.api.event.events.discord.interaction.command.DiscordMessageContextInteractionEvent; +import com.discordsrv.api.events.discord.interaction.command.DiscordMessageContextInteractionEvent; import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.discord.api.entity.component.DiscordInteractionHookImpl; import com.discordsrv.common.discord.api.entity.message.util.SendableDiscordMessageUtil; diff --git a/common/src/main/java/com/discordsrv/common/event/events/discord/interaction/command/DiscordUserContextInteractionEventImpl.java b/common/src/main/java/com/discordsrv/common/events/discord/interaction/command/DiscordUserContextInteractionEventImpl.java similarity index 93% rename from common/src/main/java/com/discordsrv/common/event/events/discord/interaction/command/DiscordUserContextInteractionEventImpl.java rename to common/src/main/java/com/discordsrv/common/events/discord/interaction/command/DiscordUserContextInteractionEventImpl.java index 5e6db7ac..7ed1321c 100644 --- a/common/src/main/java/com/discordsrv/common/event/events/discord/interaction/command/DiscordUserContextInteractionEventImpl.java +++ b/common/src/main/java/com/discordsrv/common/events/discord/interaction/command/DiscordUserContextInteractionEventImpl.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.event.events.discord.interaction.command; +package com.discordsrv.common.events.discord.interaction.command; import com.discordsrv.api.discord.entity.DiscordUser; import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel; @@ -24,7 +24,7 @@ import com.discordsrv.api.discord.entity.guild.DiscordGuildMember; import com.discordsrv.api.discord.entity.interaction.DiscordInteractionHook; import com.discordsrv.api.discord.entity.interaction.component.ComponentIdentifier; import com.discordsrv.api.discord.entity.message.SendableDiscordMessage; -import com.discordsrv.api.event.events.discord.interaction.command.DiscordUserContextInteractionEvent; +import com.discordsrv.api.events.discord.interaction.command.DiscordUserContextInteractionEvent; import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.discord.api.entity.component.DiscordInteractionHookImpl; import com.discordsrv.common.discord.api.entity.message.util.SendableDiscordMessageUtil; diff --git a/common/src/main/java/com/discordsrv/common/event/events/player/PlayerConnectedEvent.java b/common/src/main/java/com/discordsrv/common/events/player/PlayerConnectedEvent.java similarity index 91% rename from common/src/main/java/com/discordsrv/common/event/events/player/PlayerConnectedEvent.java rename to common/src/main/java/com/discordsrv/common/events/player/PlayerConnectedEvent.java index 50261e60..1f6e4835 100644 --- a/common/src/main/java/com/discordsrv/common/event/events/player/PlayerConnectedEvent.java +++ b/common/src/main/java/com/discordsrv/common/events/player/PlayerConnectedEvent.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.discordsrv.common.event.events.player; +package com.discordsrv.common.events.player; -import com.discordsrv.api.event.events.Event; -import com.discordsrv.common.player.IPlayer; +import com.discordsrv.api.events.Event; +import com.discordsrv.common.abstraction.player.IPlayer; public class PlayerConnectedEvent implements Event { diff --git a/common/src/main/java/com/discordsrv/common/event/events/player/PlayerDisconnectedEvent.java b/common/src/main/java/com/discordsrv/common/events/player/PlayerDisconnectedEvent.java similarity index 88% rename from common/src/main/java/com/discordsrv/common/event/events/player/PlayerDisconnectedEvent.java rename to common/src/main/java/com/discordsrv/common/events/player/PlayerDisconnectedEvent.java index 829f4ba1..ff27e60b 100644 --- a/common/src/main/java/com/discordsrv/common/event/events/player/PlayerDisconnectedEvent.java +++ b/common/src/main/java/com/discordsrv/common/events/player/PlayerDisconnectedEvent.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.discordsrv.common.event.events.player; +package com.discordsrv.common.events.player; -import com.discordsrv.api.event.events.Event; -import com.discordsrv.common.player.IPlayer; +import com.discordsrv.api.events.Event; +import com.discordsrv.common.abstraction.player.IPlayer; public class PlayerDisconnectedEvent implements Event { diff --git a/common/src/main/java/com/discordsrv/common/exception/MessageException.java b/common/src/main/java/com/discordsrv/common/exception/MessageException.java index 808f94d6..841b99fc 100644 --- a/common/src/main/java/com/discordsrv/common/exception/MessageException.java +++ b/common/src/main/java/com/discordsrv/common/exception/MessageException.java @@ -18,7 +18,7 @@ package com.discordsrv.common.exception; -import com.discordsrv.common.exception.util.ExceptionUtil; +import com.discordsrv.common.util.ExceptionUtil; public class MessageException extends RuntimeException { diff --git a/common/src/main/java/com/discordsrv/common/invite/DiscordInviteModule.java b/common/src/main/java/com/discordsrv/common/feature/DiscordInviteModule.java similarity index 96% rename from common/src/main/java/com/discordsrv/common/invite/DiscordInviteModule.java rename to common/src/main/java/com/discordsrv/common/feature/DiscordInviteModule.java index b489a24c..e7c227b8 100644 --- a/common/src/main/java/com/discordsrv/common/invite/DiscordInviteModule.java +++ b/common/src/main/java/com/discordsrv/common/feature/DiscordInviteModule.java @@ -16,19 +16,19 @@ * along with this program. If not, see . */ -package com.discordsrv.common.invite; +package com.discordsrv.common.feature; import com.discordsrv.api.DiscordSRVApi; import com.discordsrv.api.discord.connection.details.DiscordGatewayIntent; import com.discordsrv.api.discord.connection.jda.errorresponse.ErrorCallbackContext; -import com.discordsrv.api.event.bus.Subscribe; -import com.discordsrv.api.placeholder.format.FormattedText; +import com.discordsrv.api.eventbus.Subscribe; import com.discordsrv.api.placeholder.annotation.Placeholder; +import com.discordsrv.api.placeholder.format.FormattedText; import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.config.main.DiscordInviteConfig; -import com.discordsrv.common.discord.util.DiscordPermissionUtil; -import com.discordsrv.common.logging.NamedLogger; -import com.discordsrv.common.module.type.AbstractModule; +import com.discordsrv.common.core.logging.NamedLogger; +import com.discordsrv.common.core.module.type.AbstractModule; +import com.discordsrv.common.util.DiscordPermissionUtil; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Guild; diff --git a/common/src/main/java/com/discordsrv/common/presence/PresenceUpdaterModule.java b/common/src/main/java/com/discordsrv/common/feature/PresenceUpdaterModule.java similarity index 93% rename from common/src/main/java/com/discordsrv/common/presence/PresenceUpdaterModule.java rename to common/src/main/java/com/discordsrv/common/feature/PresenceUpdaterModule.java index e22f8e2d..f3febdae 100644 --- a/common/src/main/java/com/discordsrv/common/presence/PresenceUpdaterModule.java +++ b/common/src/main/java/com/discordsrv/common/feature/PresenceUpdaterModule.java @@ -16,16 +16,16 @@ * along with this program. If not, see . */ -package com.discordsrv.common.presence; +package com.discordsrv.common.feature; import com.discordsrv.api.DiscordSRVApi; -import com.discordsrv.api.event.bus.EventPriority; -import com.discordsrv.api.event.bus.Subscribe; -import com.discordsrv.api.event.events.lifecycle.DiscordSRVShuttingDownEvent; +import com.discordsrv.api.eventbus.EventPriority; +import com.discordsrv.api.eventbus.Subscribe; +import com.discordsrv.api.events.lifecycle.DiscordSRVShuttingDownEvent; import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.config.main.PresenceUpdaterConfig; -import com.discordsrv.common.logging.NamedLogger; -import com.discordsrv.common.module.type.AbstractModule; +import com.discordsrv.common.core.logging.NamedLogger; +import com.discordsrv.common.core.module.type.AbstractModule; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.events.StatusChangeEvent; diff --git a/common/src/main/java/com/discordsrv/common/bansync/BanSyncModule.java b/common/src/main/java/com/discordsrv/common/feature/bansync/BanSyncModule.java similarity index 93% rename from common/src/main/java/com/discordsrv/common/bansync/BanSyncModule.java rename to common/src/main/java/com/discordsrv/common/feature/bansync/BanSyncModule.java index 92cb42a4..0a4f19f1 100644 --- a/common/src/main/java/com/discordsrv/common/bansync/BanSyncModule.java +++ b/common/src/main/java/com/discordsrv/common/feature/bansync/BanSyncModule.java @@ -16,28 +16,28 @@ * along with this program. If not, see . */ -package com.discordsrv.common.bansync; +package com.discordsrv.common.feature.bansync; import com.discordsrv.api.component.MinecraftComponent; import com.discordsrv.api.discord.connection.details.DiscordGatewayIntent; -import com.discordsrv.api.event.bus.Subscribe; -import com.discordsrv.api.event.events.linking.AccountLinkedEvent; +import com.discordsrv.api.eventbus.Subscribe; +import com.discordsrv.api.events.linking.AccountLinkedEvent; import com.discordsrv.api.module.type.PunishmentModule; import com.discordsrv.api.punishment.Punishment; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.bansync.enums.BanSyncCause; -import com.discordsrv.common.bansync.enums.BanSyncResult; -import com.discordsrv.common.component.util.ComponentUtil; +import com.discordsrv.common.abstraction.player.IPlayer; +import com.discordsrv.common.abstraction.sync.AbstractSyncModule; +import com.discordsrv.common.abstraction.sync.SyncFail; +import com.discordsrv.common.abstraction.sync.cause.GenericSyncCauses; +import com.discordsrv.common.abstraction.sync.enums.SyncDirection; +import com.discordsrv.common.abstraction.sync.result.GenericSyncResults; +import com.discordsrv.common.abstraction.sync.result.ISyncResult; import com.discordsrv.common.config.main.BanSyncConfig; -import com.discordsrv.common.future.util.CompletableFutureUtil; -import com.discordsrv.common.player.IPlayer; -import com.discordsrv.common.someone.Someone; -import com.discordsrv.common.sync.AbstractSyncModule; -import com.discordsrv.common.sync.SyncFail; -import com.discordsrv.common.sync.cause.GenericSyncCauses; -import com.discordsrv.common.sync.enums.SyncDirection; -import com.discordsrv.common.sync.result.GenericSyncResults; -import com.discordsrv.common.sync.result.ISyncResult; +import com.discordsrv.common.feature.bansync.enums.BanSyncCause; +import com.discordsrv.common.feature.bansync.enums.BanSyncResult; +import com.discordsrv.common.helper.Someone; +import com.discordsrv.common.util.CompletableFutureUtil; +import com.discordsrv.common.util.ComponentUtil; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.audit.ActionType; import net.dv8tion.jda.api.audit.AuditLogEntry; diff --git a/common/src/main/java/com/discordsrv/common/bansync/enums/BanSyncCause.java b/common/src/main/java/com/discordsrv/common/feature/bansync/enums/BanSyncCause.java similarity index 88% rename from common/src/main/java/com/discordsrv/common/bansync/enums/BanSyncCause.java rename to common/src/main/java/com/discordsrv/common/feature/bansync/enums/BanSyncCause.java index cb66d88a..b4c6556e 100644 --- a/common/src/main/java/com/discordsrv/common/bansync/enums/BanSyncCause.java +++ b/common/src/main/java/com/discordsrv/common/feature/bansync/enums/BanSyncCause.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.discordsrv.common.bansync.enums; +package com.discordsrv.common.feature.bansync.enums; -import com.discordsrv.common.sync.cause.ISyncCause; +import com.discordsrv.common.abstraction.sync.cause.ISyncCause; public enum BanSyncCause implements ISyncCause { diff --git a/common/src/main/java/com/discordsrv/common/bansync/enums/BanSyncResult.java b/common/src/main/java/com/discordsrv/common/feature/bansync/enums/BanSyncResult.java similarity index 92% rename from common/src/main/java/com/discordsrv/common/bansync/enums/BanSyncResult.java rename to common/src/main/java/com/discordsrv/common/feature/bansync/enums/BanSyncResult.java index 55d36b24..3dd042e3 100644 --- a/common/src/main/java/com/discordsrv/common/bansync/enums/BanSyncResult.java +++ b/common/src/main/java/com/discordsrv/common/feature/bansync/enums/BanSyncResult.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.discordsrv.common.bansync.enums; +package com.discordsrv.common.feature.bansync.enums; -import com.discordsrv.common.sync.result.ISyncResult; +import com.discordsrv.common.abstraction.sync.result.ISyncResult; public enum BanSyncResult implements ISyncResult { diff --git a/common/src/main/java/com/discordsrv/common/channel/ChannelLockingModule.java b/common/src/main/java/com/discordsrv/common/feature/channel/ChannelLockingModule.java similarity index 97% rename from common/src/main/java/com/discordsrv/common/channel/ChannelLockingModule.java rename to common/src/main/java/com/discordsrv/common/feature/channel/ChannelLockingModule.java index 3729794f..3904b0b2 100644 --- a/common/src/main/java/com/discordsrv/common/channel/ChannelLockingModule.java +++ b/common/src/main/java/com/discordsrv/common/feature/channel/ChannelLockingModule.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.channel; +package com.discordsrv.common.feature.channel; import com.discordsrv.api.discord.entity.channel.DiscordGuildMessageChannel; import com.discordsrv.api.discord.entity.channel.DiscordThreadChannel; @@ -24,8 +24,8 @@ import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.config.main.channels.ChannelLockingConfig; import com.discordsrv.common.config.main.channels.base.BaseChannelConfig; import com.discordsrv.common.config.main.channels.base.IChannelConfig; -import com.discordsrv.common.discord.util.DiscordPermissionUtil; -import com.discordsrv.common.module.type.AbstractModule; +import com.discordsrv.common.core.module.type.AbstractModule; +import com.discordsrv.common.util.DiscordPermissionUtil; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.IPermissionHolder; diff --git a/common/src/main/java/com/discordsrv/common/channel/TimedUpdaterModule.java b/common/src/main/java/com/discordsrv/common/feature/channel/TimedUpdaterModule.java similarity index 97% rename from common/src/main/java/com/discordsrv/common/channel/TimedUpdaterModule.java rename to common/src/main/java/com/discordsrv/common/feature/channel/TimedUpdaterModule.java index 8049edea..74138710 100644 --- a/common/src/main/java/com/discordsrv/common/channel/TimedUpdaterModule.java +++ b/common/src/main/java/com/discordsrv/common/feature/channel/TimedUpdaterModule.java @@ -16,15 +16,15 @@ * along with this program. If not, see . */ -package com.discordsrv.common.channel; +package com.discordsrv.common.feature.channel; import com.discordsrv.api.DiscordSRVApi; import com.discordsrv.api.discord.connection.jda.errorresponse.ErrorCallbackContext; import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.ServerDiscordSRV; import com.discordsrv.common.config.main.TimedUpdaterConfig; -import com.discordsrv.common.logging.NamedLogger; -import com.discordsrv.common.module.type.AbstractModule; +import com.discordsrv.common.core.logging.NamedLogger; +import com.discordsrv.common.core.module.type.AbstractModule; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel; diff --git a/common/src/main/java/com/discordsrv/common/channel/GlobalChannel.java b/common/src/main/java/com/discordsrv/common/feature/channel/global/GlobalChannel.java similarity index 96% rename from common/src/main/java/com/discordsrv/common/channel/GlobalChannel.java rename to common/src/main/java/com/discordsrv/common/feature/channel/global/GlobalChannel.java index a4d4befb..13324ba1 100644 --- a/common/src/main/java/com/discordsrv/common/channel/GlobalChannel.java +++ b/common/src/main/java/com/discordsrv/common/feature/channel/global/GlobalChannel.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.channel; +package com.discordsrv.common.feature.channel.global; import com.discordsrv.api.channel.GameChannel; import com.discordsrv.api.player.DiscordSRVPlayer; diff --git a/common/src/main/java/com/discordsrv/common/channel/GlobalChannelLookupModule.java b/common/src/main/java/com/discordsrv/common/feature/channel/global/GlobalChannelLookupModule.java similarity index 83% rename from common/src/main/java/com/discordsrv/common/channel/GlobalChannelLookupModule.java rename to common/src/main/java/com/discordsrv/common/feature/channel/global/GlobalChannelLookupModule.java index 3380bb65..490d26cd 100644 --- a/common/src/main/java/com/discordsrv/common/channel/GlobalChannelLookupModule.java +++ b/common/src/main/java/com/discordsrv/common/feature/channel/global/GlobalChannelLookupModule.java @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package com.discordsrv.common.channel; +package com.discordsrv.common.feature.channel.global; -import com.discordsrv.api.event.bus.EventPriority; -import com.discordsrv.api.event.bus.Subscribe; -import com.discordsrv.api.event.events.channel.GameChannelLookupEvent; +import com.discordsrv.api.eventbus.EventPriority; +import com.discordsrv.api.eventbus.Subscribe; +import com.discordsrv.api.events.channel.GameChannelLookupEvent; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.module.type.AbstractModule; +import com.discordsrv.common.core.module.type.AbstractModule; public class GlobalChannelLookupModule extends AbstractModule { diff --git a/common/src/main/java/com/discordsrv/common/console/Console.java b/common/src/main/java/com/discordsrv/common/feature/console/Console.java similarity index 91% rename from common/src/main/java/com/discordsrv/common/console/Console.java rename to common/src/main/java/com/discordsrv/common/feature/console/Console.java index 43ceecc2..6bc77d2e 100644 --- a/common/src/main/java/com/discordsrv/common/console/Console.java +++ b/common/src/main/java/com/discordsrv/common/feature/console/Console.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.discordsrv.common.console; +package com.discordsrv.common.feature.console; import com.discordsrv.common.command.game.executor.CommandExecutorProvider; import com.discordsrv.common.command.game.sender.ICommandSender; -import com.discordsrv.common.logging.backend.LoggingBackend; +import com.discordsrv.common.core.logging.backend.LoggingBackend; public interface Console extends ICommandSender { diff --git a/common/src/main/java/com/discordsrv/common/console/ConsoleModule.java b/common/src/main/java/com/discordsrv/common/feature/console/ConsoleModule.java similarity index 91% rename from common/src/main/java/com/discordsrv/common/console/ConsoleModule.java rename to common/src/main/java/com/discordsrv/common/feature/console/ConsoleModule.java index 0b098c94..5d84a6f0 100644 --- a/common/src/main/java/com/discordsrv/common/console/ConsoleModule.java +++ b/common/src/main/java/com/discordsrv/common/feature/console/ConsoleModule.java @@ -16,21 +16,21 @@ * along with this program. If not, see . */ -package com.discordsrv.common.console; +package com.discordsrv.common.feature.console; import com.discordsrv.api.DiscordSRVApi; import com.discordsrv.api.discord.connection.details.DiscordGatewayIntent; -import com.discordsrv.api.event.bus.Subscribe; -import com.discordsrv.api.event.events.discord.message.DiscordMessageReceiveEvent; +import com.discordsrv.api.eventbus.Subscribe; +import com.discordsrv.api.events.discord.message.DiscordMessageReceiveEvent; import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.config.main.ConsoleConfig; import com.discordsrv.common.config.main.generic.DestinationConfig; -import com.discordsrv.common.console.entry.LogEntry; +import com.discordsrv.common.core.logging.NamedLogger; +import com.discordsrv.common.core.logging.backend.LoggingBackend; +import com.discordsrv.common.core.module.type.AbstractModule; +import com.discordsrv.common.feature.console.entry.LogEntry; import com.discordsrv.common.logging.LogAppender; import com.discordsrv.common.logging.LogLevel; -import com.discordsrv.common.logging.NamedLogger; -import com.discordsrv.common.logging.backend.LoggingBackend; -import com.discordsrv.common.module.type.AbstractModule; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/com/discordsrv/common/console/SingleConsoleHandler.java b/common/src/main/java/com/discordsrv/common/feature/console/SingleConsoleHandler.java similarity index 98% rename from common/src/main/java/com/discordsrv/common/console/SingleConsoleHandler.java rename to common/src/main/java/com/discordsrv/common/feature/console/SingleConsoleHandler.java index a4c0a5a9..fd1ff4aa 100644 --- a/common/src/main/java/com/discordsrv/common/console/SingleConsoleHandler.java +++ b/common/src/main/java/com/discordsrv/common/feature/console/SingleConsoleHandler.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.console; +package com.discordsrv.common.feature.console; import com.discordsrv.api.discord.entity.DiscordUser; import com.discordsrv.api.discord.entity.channel.DiscordGuildChannel; @@ -26,7 +26,7 @@ import com.discordsrv.api.discord.entity.guild.DiscordGuildMember; import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessage; import com.discordsrv.api.discord.entity.message.SendableDiscordMessage; import com.discordsrv.api.discord.util.DiscordFormattingUtil; -import com.discordsrv.api.event.events.discord.message.DiscordMessageReceiveEvent; +import com.discordsrv.api.events.discord.message.DiscordMessageReceiveEvent; import com.discordsrv.api.placeholder.format.PlainPlaceholderFormat; import com.discordsrv.api.placeholder.provider.SinglePlaceholder; import com.discordsrv.common.DiscordSRV; @@ -34,11 +34,11 @@ import com.discordsrv.common.command.game.GameCommandExecutionHelper; import com.discordsrv.common.config.main.ConsoleConfig; import com.discordsrv.common.config.main.generic.DestinationConfig; import com.discordsrv.common.config.main.generic.GameCommandExecutionConditionConfig; -import com.discordsrv.common.console.entry.LogEntry; -import com.discordsrv.common.console.entry.LogMessage; -import com.discordsrv.common.console.message.ConsoleMessage; +import com.discordsrv.common.core.logging.Logger; +import com.discordsrv.common.feature.console.entry.LogEntry; +import com.discordsrv.common.feature.console.entry.LogMessage; +import com.discordsrv.common.feature.console.message.ConsoleMessage; import com.discordsrv.common.logging.LogLevel; -import com.discordsrv.common.logging.Logger; import net.dv8tion.jda.api.entities.Message; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.exception.ExceptionUtils; diff --git a/common/src/main/java/com/discordsrv/common/console/entry/LogEntry.java b/common/src/main/java/com/discordsrv/common/feature/console/entry/LogEntry.java similarity index 97% rename from common/src/main/java/com/discordsrv/common/console/entry/LogEntry.java rename to common/src/main/java/com/discordsrv/common/feature/console/entry/LogEntry.java index 5ee35f6c..f2cd4ce6 100644 --- a/common/src/main/java/com/discordsrv/common/console/entry/LogEntry.java +++ b/common/src/main/java/com/discordsrv/common/feature/console/entry/LogEntry.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.console.entry; +package com.discordsrv.common.feature.console.entry; import com.discordsrv.api.placeholder.annotation.Placeholder; import com.discordsrv.common.logging.LogLevel; diff --git a/common/src/main/java/com/discordsrv/common/console/entry/LogMessage.java b/common/src/main/java/com/discordsrv/common/feature/console/entry/LogMessage.java similarity index 95% rename from common/src/main/java/com/discordsrv/common/console/entry/LogMessage.java rename to common/src/main/java/com/discordsrv/common/feature/console/entry/LogMessage.java index ee1551e6..3a12f8fe 100644 --- a/common/src/main/java/com/discordsrv/common/console/entry/LogMessage.java +++ b/common/src/main/java/com/discordsrv/common/feature/console/entry/LogMessage.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.console.entry; +package com.discordsrv.common.feature.console.entry; /** * A {@link LogEntry} with formatting. diff --git a/common/src/main/java/com/discordsrv/common/console/message/ConsoleMessage.java b/common/src/main/java/com/discordsrv/common/feature/console/message/ConsoleMessage.java similarity index 99% rename from common/src/main/java/com/discordsrv/common/console/message/ConsoleMessage.java rename to common/src/main/java/com/discordsrv/common/feature/console/message/ConsoleMessage.java index 9c4eb9f0..efed2c66 100644 --- a/common/src/main/java/com/discordsrv/common/console/message/ConsoleMessage.java +++ b/common/src/main/java/com/discordsrv/common/feature/console/message/ConsoleMessage.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.console.message; +package com.discordsrv.common.feature.console.message; import com.discordsrv.common.DiscordSRV; import net.kyori.adventure.text.Component; diff --git a/common/src/main/java/com/discordsrv/common/debug/DebugGenerateEvent.java b/common/src/main/java/com/discordsrv/common/feature/debug/DebugGenerateEvent.java similarity index 88% rename from common/src/main/java/com/discordsrv/common/debug/DebugGenerateEvent.java rename to common/src/main/java/com/discordsrv/common/feature/debug/DebugGenerateEvent.java index 1dade15d..4d5f6545 100644 --- a/common/src/main/java/com/discordsrv/common/debug/DebugGenerateEvent.java +++ b/common/src/main/java/com/discordsrv/common/feature/debug/DebugGenerateEvent.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.discordsrv.common.debug; +package com.discordsrv.common.feature.debug; -import com.discordsrv.api.event.events.Event; -import com.discordsrv.common.debug.file.DebugFile; +import com.discordsrv.api.events.Event; +import com.discordsrv.common.feature.debug.file.DebugFile; public class DebugGenerateEvent implements Event { diff --git a/common/src/main/java/com/discordsrv/common/debug/DebugReport.java b/common/src/main/java/com/discordsrv/common/feature/debug/DebugReport.java similarity index 96% rename from common/src/main/java/com/discordsrv/common/debug/DebugReport.java rename to common/src/main/java/com/discordsrv/common/feature/debug/DebugReport.java index edf09400..c1c6b97b 100644 --- a/common/src/main/java/com/discordsrv/common/debug/DebugReport.java +++ b/common/src/main/java/com/discordsrv/common/feature/debug/DebugReport.java @@ -16,20 +16,20 @@ * along with this program. If not, see . */ -package com.discordsrv.common.debug; +package com.discordsrv.common.feature.debug; import com.discordsrv.common.DiscordSRV; +import com.discordsrv.common.abstraction.plugin.Plugin; import com.discordsrv.common.config.configurate.manager.MessagesConfigSingleManager; import com.discordsrv.common.config.configurate.manager.abstraction.ConfigurateConfigManager; import com.discordsrv.common.config.connection.ConnectionConfig; import com.discordsrv.common.config.connection.StorageConfig; import com.discordsrv.common.config.messages.MessagesConfig; -import com.discordsrv.common.debug.file.DebugFile; -import com.discordsrv.common.debug.file.KeyValueDebugFile; -import com.discordsrv.common.debug.file.TextDebugFile; -import com.discordsrv.common.paste.Paste; -import com.discordsrv.common.paste.PasteService; -import com.discordsrv.common.plugin.Plugin; +import com.discordsrv.common.core.paste.Paste; +import com.discordsrv.common.core.paste.PasteService; +import com.discordsrv.common.feature.debug.file.DebugFile; +import com.discordsrv.common.feature.debug.file.KeyValueDebugFile; +import com.discordsrv.common.feature.debug.file.TextDebugFile; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/common/src/main/java/com/discordsrv/common/debug/data/OnlineMode.java b/common/src/main/java/com/discordsrv/common/feature/debug/data/OnlineMode.java similarity index 96% rename from common/src/main/java/com/discordsrv/common/debug/data/OnlineMode.java rename to common/src/main/java/com/discordsrv/common/feature/debug/data/OnlineMode.java index a200e4e8..d18eb28c 100644 --- a/common/src/main/java/com/discordsrv/common/debug/data/OnlineMode.java +++ b/common/src/main/java/com/discordsrv/common/feature/debug/data/OnlineMode.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.debug.data; +package com.discordsrv.common.feature.debug.data; public enum OnlineMode { diff --git a/common/src/main/java/com/discordsrv/common/debug/data/VersionInfo.java b/common/src/main/java/com/discordsrv/common/feature/debug/data/VersionInfo.java similarity index 97% rename from common/src/main/java/com/discordsrv/common/debug/data/VersionInfo.java rename to common/src/main/java/com/discordsrv/common/feature/debug/data/VersionInfo.java index de62fd6f..15646a9b 100644 --- a/common/src/main/java/com/discordsrv/common/debug/data/VersionInfo.java +++ b/common/src/main/java/com/discordsrv/common/feature/debug/data/VersionInfo.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.debug.data; +package com.discordsrv.common.feature.debug.data; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/com/discordsrv/common/debug/file/DebugFile.java b/common/src/main/java/com/discordsrv/common/feature/debug/file/DebugFile.java similarity index 94% rename from common/src/main/java/com/discordsrv/common/debug/file/DebugFile.java rename to common/src/main/java/com/discordsrv/common/feature/debug/file/DebugFile.java index 22607e14..a448fa1b 100644 --- a/common/src/main/java/com/discordsrv/common/debug/file/DebugFile.java +++ b/common/src/main/java/com/discordsrv/common/feature/debug/file/DebugFile.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.debug.file; +package com.discordsrv.common.feature.debug.file; public interface DebugFile { diff --git a/common/src/main/java/com/discordsrv/common/debug/file/KeyValueDebugFile.java b/common/src/main/java/com/discordsrv/common/feature/debug/file/KeyValueDebugFile.java similarity index 97% rename from common/src/main/java/com/discordsrv/common/debug/file/KeyValueDebugFile.java rename to common/src/main/java/com/discordsrv/common/feature/debug/file/KeyValueDebugFile.java index 72f08d7e..c05247c9 100644 --- a/common/src/main/java/com/discordsrv/common/debug/file/KeyValueDebugFile.java +++ b/common/src/main/java/com/discordsrv/common/feature/debug/file/KeyValueDebugFile.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.debug.file; +package com.discordsrv.common.feature.debug.file; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.lang3.exception.ExceptionUtils; diff --git a/common/src/main/java/com/discordsrv/common/debug/file/TextDebugFile.java b/common/src/main/java/com/discordsrv/common/feature/debug/file/TextDebugFile.java similarity index 96% rename from common/src/main/java/com/discordsrv/common/debug/file/TextDebugFile.java rename to common/src/main/java/com/discordsrv/common/feature/debug/file/TextDebugFile.java index b6906fab..ba5e40d8 100644 --- a/common/src/main/java/com/discordsrv/common/debug/file/TextDebugFile.java +++ b/common/src/main/java/com/discordsrv/common/feature/debug/file/TextDebugFile.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.debug.file; +package com.discordsrv.common.feature.debug.file; public class TextDebugFile implements DebugFile { diff --git a/common/src/main/java/com/discordsrv/common/groupsync/GroupSyncModule.java b/common/src/main/java/com/discordsrv/common/feature/groupsync/GroupSyncModule.java similarity index 93% rename from common/src/main/java/com/discordsrv/common/groupsync/GroupSyncModule.java rename to common/src/main/java/com/discordsrv/common/feature/groupsync/GroupSyncModule.java index 8c69034a..823b996a 100644 --- a/common/src/main/java/com/discordsrv/common/groupsync/GroupSyncModule.java +++ b/common/src/main/java/com/discordsrv/common/feature/groupsync/GroupSyncModule.java @@ -16,25 +16,25 @@ * along with this program. If not, see . */ -package com.discordsrv.common.groupsync; +package com.discordsrv.common.feature.groupsync; import com.discordsrv.api.discord.entity.guild.DiscordRole; -import com.discordsrv.api.event.bus.Subscribe; -import com.discordsrv.api.event.events.discord.member.role.DiscordMemberRoleAddEvent; -import com.discordsrv.api.event.events.discord.member.role.DiscordMemberRoleRemoveEvent; +import com.discordsrv.api.eventbus.Subscribe; +import com.discordsrv.api.events.discord.member.role.DiscordMemberRoleAddEvent; +import com.discordsrv.api.events.discord.member.role.DiscordMemberRoleRemoveEvent; import com.discordsrv.api.module.type.PermissionModule; import com.discordsrv.common.DiscordSRV; +import com.discordsrv.common.abstraction.sync.AbstractSyncModule; +import com.discordsrv.common.abstraction.sync.SyncFail; +import com.discordsrv.common.abstraction.sync.result.GenericSyncResults; +import com.discordsrv.common.abstraction.sync.result.ISyncResult; import com.discordsrv.common.config.main.GroupSyncConfig; -import com.discordsrv.common.debug.DebugGenerateEvent; -import com.discordsrv.common.debug.file.TextDebugFile; -import com.discordsrv.common.future.util.CompletableFutureUtil; -import com.discordsrv.common.groupsync.enums.GroupSyncCause; -import com.discordsrv.common.groupsync.enums.GroupSyncResult; -import com.discordsrv.common.someone.Someone; -import com.discordsrv.common.sync.AbstractSyncModule; -import com.discordsrv.common.sync.SyncFail; -import com.discordsrv.common.sync.result.GenericSyncResults; -import com.discordsrv.common.sync.result.ISyncResult; +import com.discordsrv.common.feature.debug.DebugGenerateEvent; +import com.discordsrv.common.feature.debug.file.TextDebugFile; +import com.discordsrv.common.feature.groupsync.enums.GroupSyncCause; +import com.discordsrv.common.feature.groupsync.enums.GroupSyncResult; +import com.discordsrv.common.helper.Someone; +import com.discordsrv.common.util.CompletableFutureUtil; import com.github.benmanes.caffeine.cache.Cache; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/com/discordsrv/common/groupsync/enums/GroupSyncCause.java b/common/src/main/java/com/discordsrv/common/feature/groupsync/enums/GroupSyncCause.java similarity index 92% rename from common/src/main/java/com/discordsrv/common/groupsync/enums/GroupSyncCause.java rename to common/src/main/java/com/discordsrv/common/feature/groupsync/enums/GroupSyncCause.java index 1fca04d0..3f50c4dc 100644 --- a/common/src/main/java/com/discordsrv/common/groupsync/enums/GroupSyncCause.java +++ b/common/src/main/java/com/discordsrv/common/feature/groupsync/enums/GroupSyncCause.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.discordsrv.common.groupsync.enums; +package com.discordsrv.common.feature.groupsync.enums; -import com.discordsrv.common.sync.cause.ISyncCause; +import com.discordsrv.common.abstraction.sync.cause.ISyncCause; public enum GroupSyncCause implements ISyncCause { diff --git a/common/src/main/java/com/discordsrv/common/groupsync/enums/GroupSyncResult.java b/common/src/main/java/com/discordsrv/common/feature/groupsync/enums/GroupSyncResult.java similarity index 93% rename from common/src/main/java/com/discordsrv/common/groupsync/enums/GroupSyncResult.java rename to common/src/main/java/com/discordsrv/common/feature/groupsync/enums/GroupSyncResult.java index 54f9c646..353cf11e 100644 --- a/common/src/main/java/com/discordsrv/common/groupsync/enums/GroupSyncResult.java +++ b/common/src/main/java/com/discordsrv/common/feature/groupsync/enums/GroupSyncResult.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.discordsrv.common.groupsync.enums; +package com.discordsrv.common.feature.groupsync.enums; -import com.discordsrv.common.sync.result.ISyncResult; +import com.discordsrv.common.abstraction.sync.result.ISyncResult; public enum GroupSyncResult implements ISyncResult { diff --git a/common/src/main/java/com/discordsrv/common/linking/LinkProvider.java b/common/src/main/java/com/discordsrv/common/feature/linking/LinkProvider.java similarity index 96% rename from common/src/main/java/com/discordsrv/common/linking/LinkProvider.java rename to common/src/main/java/com/discordsrv/common/feature/linking/LinkProvider.java index 9d93026a..24dcc0eb 100644 --- a/common/src/main/java/com/discordsrv/common/linking/LinkProvider.java +++ b/common/src/main/java/com/discordsrv/common/feature/linking/LinkProvider.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.discordsrv.common.linking; +package com.discordsrv.common.feature.linking; import com.discordsrv.api.component.MinecraftComponent; -import com.discordsrv.common.player.IPlayer; +import com.discordsrv.common.abstraction.player.IPlayer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/com/discordsrv/common/linking/LinkStore.java b/common/src/main/java/com/discordsrv/common/feature/linking/LinkStore.java similarity index 97% rename from common/src/main/java/com/discordsrv/common/linking/LinkStore.java rename to common/src/main/java/com/discordsrv/common/feature/linking/LinkStore.java index 85d010a2..90cc59c9 100644 --- a/common/src/main/java/com/discordsrv/common/linking/LinkStore.java +++ b/common/src/main/java/com/discordsrv/common/feature/linking/LinkStore.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.linking; +package com.discordsrv.common.feature.linking; import org.jetbrains.annotations.NotNull; diff --git a/common/src/main/java/com/discordsrv/common/linking/LinkingModule.java b/common/src/main/java/com/discordsrv/common/feature/linking/LinkingModule.java similarity index 85% rename from common/src/main/java/com/discordsrv/common/linking/LinkingModule.java rename to common/src/main/java/com/discordsrv/common/feature/linking/LinkingModule.java index 7bc3274d..0343ed2b 100644 --- a/common/src/main/java/com/discordsrv/common/linking/LinkingModule.java +++ b/common/src/main/java/com/discordsrv/common/feature/linking/LinkingModule.java @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package com.discordsrv.common.linking; +package com.discordsrv.common.feature.linking; -import com.discordsrv.api.event.events.linking.AccountLinkedEvent; -import com.discordsrv.api.event.events.linking.AccountUnlinkedEvent; +import com.discordsrv.api.events.linking.AccountLinkedEvent; +import com.discordsrv.api.events.linking.AccountUnlinkedEvent; import com.discordsrv.api.profile.IProfile; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.logging.NamedLogger; -import com.discordsrv.common.module.type.AbstractModule; +import com.discordsrv.common.core.logging.NamedLogger; +import com.discordsrv.common.core.module.type.AbstractModule; import java.util.UUID; diff --git a/common/src/main/java/com/discordsrv/common/linking/impl/CachedLinkProvider.java b/common/src/main/java/com/discordsrv/common/feature/linking/impl/CachedLinkProvider.java similarity index 96% rename from common/src/main/java/com/discordsrv/common/linking/impl/CachedLinkProvider.java rename to common/src/main/java/com/discordsrv/common/feature/linking/impl/CachedLinkProvider.java index 9de579ac..e0c66efa 100644 --- a/common/src/main/java/com/discordsrv/common/linking/impl/CachedLinkProvider.java +++ b/common/src/main/java/com/discordsrv/common/feature/linking/impl/CachedLinkProvider.java @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package com.discordsrv.common.linking.impl; +package com.discordsrv.common.feature.linking.impl; -import com.discordsrv.api.event.bus.Subscribe; +import com.discordsrv.api.eventbus.Subscribe; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.event.events.player.PlayerConnectedEvent; -import com.discordsrv.common.linking.LinkProvider; -import com.discordsrv.common.linking.LinkStore; +import com.discordsrv.common.events.player.PlayerConnectedEvent; +import com.discordsrv.common.feature.linking.LinkProvider; +import com.discordsrv.common.feature.linking.LinkStore; import com.github.benmanes.caffeine.cache.AsyncCacheLoader; import com.github.benmanes.caffeine.cache.AsyncLoadingCache; import com.github.benmanes.caffeine.cache.Cache; diff --git a/common/src/main/java/com/discordsrv/common/linking/impl/MinecraftAuthenticationLinker.java b/common/src/main/java/com/discordsrv/common/feature/linking/impl/MinecraftAuthenticationLinker.java similarity index 92% rename from common/src/main/java/com/discordsrv/common/linking/impl/MinecraftAuthenticationLinker.java rename to common/src/main/java/com/discordsrv/common/feature/linking/impl/MinecraftAuthenticationLinker.java index 3417dcf2..b0492bb0 100644 --- a/common/src/main/java/com/discordsrv/common/linking/impl/MinecraftAuthenticationLinker.java +++ b/common/src/main/java/com/discordsrv/common/feature/linking/impl/MinecraftAuthenticationLinker.java @@ -16,19 +16,19 @@ * along with this program. If not, see . */ -package com.discordsrv.common.linking.impl; +package com.discordsrv.common.feature.linking.impl; import com.discordsrv.api.component.MinecraftComponent; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.function.CheckedSupplier; -import com.discordsrv.common.future.util.CompletableFutureUtil; -import com.discordsrv.common.linking.LinkStore; -import com.discordsrv.common.linking.LinkingModule; -import com.discordsrv.common.linking.requirelinking.RequiredLinkingModule; -import com.discordsrv.common.linking.requirelinking.requirement.type.MinecraftAuthRequirementType; -import com.discordsrv.common.logging.Logger; -import com.discordsrv.common.logging.NamedLogger; -import com.discordsrv.common.player.IPlayer; +import com.discordsrv.common.abstraction.player.IPlayer; +import com.discordsrv.common.core.logging.Logger; +import com.discordsrv.common.core.logging.NamedLogger; +import com.discordsrv.common.feature.linking.LinkStore; +import com.discordsrv.common.feature.linking.LinkingModule; +import com.discordsrv.common.feature.linking.requirelinking.RequiredLinkingModule; +import com.discordsrv.common.feature.linking.requirelinking.requirement.type.MinecraftAuthRequirementType; +import com.discordsrv.common.util.CompletableFutureUtil; +import com.discordsrv.common.util.function.CheckedSupplier; import me.minecraftauth.lib.AuthService; import me.minecraftauth.lib.account.AccountType; import me.minecraftauth.lib.account.platform.discord.DiscordAccount; diff --git a/common/src/main/java/com/discordsrv/common/linking/impl/StorageLinker.java b/common/src/main/java/com/discordsrv/common/feature/linking/impl/StorageLinker.java similarity index 97% rename from common/src/main/java/com/discordsrv/common/linking/impl/StorageLinker.java rename to common/src/main/java/com/discordsrv/common/feature/linking/impl/StorageLinker.java index 67019474..19fb0805 100644 --- a/common/src/main/java/com/discordsrv/common/linking/impl/StorageLinker.java +++ b/common/src/main/java/com/discordsrv/common/feature/linking/impl/StorageLinker.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.discordsrv.common.linking.impl; +package com.discordsrv.common.feature.linking.impl; import com.discordsrv.api.component.MinecraftComponent; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.component.util.ComponentUtil; +import com.discordsrv.common.util.ComponentUtil; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/com/discordsrv/common/linking/requirelinking/RequiredLinkingModule.java b/common/src/main/java/com/discordsrv/common/feature/linking/requirelinking/RequiredLinkingModule.java similarity index 85% rename from common/src/main/java/com/discordsrv/common/linking/requirelinking/RequiredLinkingModule.java rename to common/src/main/java/com/discordsrv/common/feature/linking/requirelinking/RequiredLinkingModule.java index dee4d252..06af6f2c 100644 --- a/common/src/main/java/com/discordsrv/common/linking/requirelinking/RequiredLinkingModule.java +++ b/common/src/main/java/com/discordsrv/common/feature/linking/requirelinking/RequiredLinkingModule.java @@ -16,32 +16,32 @@ * along with this program. If not, see . */ -package com.discordsrv.common.linking.requirelinking; +package com.discordsrv.common.feature.linking.requirelinking; import com.discordsrv.api.DiscordSRVApi; -import com.discordsrv.api.event.bus.Subscribe; -import com.discordsrv.api.event.events.linking.AccountUnlinkedEvent; +import com.discordsrv.api.eventbus.Subscribe; +import com.discordsrv.api.events.linking.AccountUnlinkedEvent; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.component.util.ComponentUtil; +import com.discordsrv.common.abstraction.player.IPlayer; import com.discordsrv.common.config.main.linking.RequiredLinkingConfig; import com.discordsrv.common.config.main.linking.RequirementsConfig; -import com.discordsrv.common.future.util.CompletableFutureUtil; -import com.discordsrv.common.linking.LinkProvider; -import com.discordsrv.common.linking.impl.MinecraftAuthenticationLinker; -import com.discordsrv.common.linking.requirelinking.requirement.Requirement; -import com.discordsrv.common.linking.requirelinking.requirement.RequirementType; -import com.discordsrv.common.linking.requirelinking.requirement.parser.ParsedRequirements; -import com.discordsrv.common.linking.requirelinking.requirement.parser.RequirementParser; -import com.discordsrv.common.linking.requirelinking.requirement.type.DiscordBoostingRequirementType; -import com.discordsrv.common.linking.requirelinking.requirement.type.DiscordRoleRequirementType; -import com.discordsrv.common.linking.requirelinking.requirement.type.DiscordServerRequirementType; -import com.discordsrv.common.linking.requirelinking.requirement.type.MinecraftAuthRequirementType; -import com.discordsrv.common.module.type.AbstractModule; -import com.discordsrv.common.player.IPlayer; -import com.discordsrv.common.scheduler.Scheduler; -import com.discordsrv.common.scheduler.executor.DynamicCachingThreadPoolExecutor; -import com.discordsrv.common.scheduler.threadfactory.CountingThreadFactory; -import com.discordsrv.common.someone.Someone; +import com.discordsrv.common.core.module.type.AbstractModule; +import com.discordsrv.common.core.scheduler.Scheduler; +import com.discordsrv.common.core.scheduler.executor.DynamicCachingThreadPoolExecutor; +import com.discordsrv.common.core.scheduler.threadfactory.CountingThreadFactory; +import com.discordsrv.common.feature.linking.LinkProvider; +import com.discordsrv.common.feature.linking.impl.MinecraftAuthenticationLinker; +import com.discordsrv.common.feature.linking.requirelinking.requirement.Requirement; +import com.discordsrv.common.feature.linking.requirelinking.requirement.RequirementType; +import com.discordsrv.common.feature.linking.requirelinking.requirement.parser.ParsedRequirements; +import com.discordsrv.common.feature.linking.requirelinking.requirement.parser.RequirementParser; +import com.discordsrv.common.feature.linking.requirelinking.requirement.type.DiscordBoostingRequirementType; +import com.discordsrv.common.feature.linking.requirelinking.requirement.type.DiscordRoleRequirementType; +import com.discordsrv.common.feature.linking.requirelinking.requirement.type.DiscordServerRequirementType; +import com.discordsrv.common.feature.linking.requirelinking.requirement.type.MinecraftAuthRequirementType; +import com.discordsrv.common.helper.Someone; +import com.discordsrv.common.util.CompletableFutureUtil; +import com.discordsrv.common.util.ComponentUtil; import net.kyori.adventure.text.Component; import java.util.ArrayList; diff --git a/common/src/main/java/com/discordsrv/common/linking/requirelinking/ServerRequireLinkingModule.java b/common/src/main/java/com/discordsrv/common/feature/linking/requirelinking/ServerRequireLinkingModule.java similarity index 93% rename from common/src/main/java/com/discordsrv/common/linking/requirelinking/ServerRequireLinkingModule.java rename to common/src/main/java/com/discordsrv/common/feature/linking/requirelinking/ServerRequireLinkingModule.java index 0a32ede5..6962df8f 100644 --- a/common/src/main/java/com/discordsrv/common/linking/requirelinking/ServerRequireLinkingModule.java +++ b/common/src/main/java/com/discordsrv/common/feature/linking/requirelinking/ServerRequireLinkingModule.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.discordsrv.common.linking.requirelinking; +package com.discordsrv.common.feature.linking.requirelinking; import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.config.main.linking.ServerRequiredLinkingConfig; -import com.discordsrv.common.linking.requirelinking.requirement.parser.ParsedRequirements; +import com.discordsrv.common.feature.linking.requirelinking.requirement.parser.ParsedRequirements; import net.kyori.adventure.text.Component; import java.util.List; diff --git a/common/src/main/java/com/discordsrv/common/linking/requirelinking/requirement/Requirement.java b/common/src/main/java/com/discordsrv/common/feature/linking/requirelinking/requirement/Requirement.java similarity index 94% rename from common/src/main/java/com/discordsrv/common/linking/requirelinking/requirement/Requirement.java rename to common/src/main/java/com/discordsrv/common/feature/linking/requirelinking/requirement/Requirement.java index 9a442518..86c28c22 100644 --- a/common/src/main/java/com/discordsrv/common/linking/requirelinking/requirement/Requirement.java +++ b/common/src/main/java/com/discordsrv/common/feature/linking/requirelinking/requirement/Requirement.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.linking.requirelinking.requirement; +package com.discordsrv.common.feature.linking.requirelinking.requirement; public class Requirement { diff --git a/common/src/main/java/com/discordsrv/common/linking/requirelinking/requirement/RequirementType.java b/common/src/main/java/com/discordsrv/common/feature/linking/requirelinking/requirement/RequirementType.java similarity index 85% rename from common/src/main/java/com/discordsrv/common/linking/requirelinking/requirement/RequirementType.java rename to common/src/main/java/com/discordsrv/common/feature/linking/requirelinking/requirement/RequirementType.java index 8ee857cb..5bffdee8 100644 --- a/common/src/main/java/com/discordsrv/common/linking/requirelinking/requirement/RequirementType.java +++ b/common/src/main/java/com/discordsrv/common/feature/linking/requirelinking/requirement/RequirementType.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package com.discordsrv.common.linking.requirelinking.requirement; +package com.discordsrv.common.feature.linking.requirelinking.requirement; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.linking.requirelinking.RequiredLinkingModule; -import com.discordsrv.common.module.type.AbstractModule; -import com.discordsrv.common.someone.Someone; +import com.discordsrv.common.core.module.type.AbstractModule; +import com.discordsrv.common.feature.linking.requirelinking.RequiredLinkingModule; +import com.discordsrv.common.helper.Someone; import java.util.concurrent.CompletableFuture; diff --git a/common/src/main/java/com/discordsrv/common/linking/requirelinking/requirement/parser/ParsedRequirements.java b/common/src/main/java/com/discordsrv/common/feature/linking/requirelinking/requirement/parser/ParsedRequirements.java similarity index 89% rename from common/src/main/java/com/discordsrv/common/linking/requirelinking/requirement/parser/ParsedRequirements.java rename to common/src/main/java/com/discordsrv/common/feature/linking/requirelinking/requirement/parser/ParsedRequirements.java index 69e6bb3d..d3e95129 100644 --- a/common/src/main/java/com/discordsrv/common/linking/requirelinking/requirement/parser/ParsedRequirements.java +++ b/common/src/main/java/com/discordsrv/common/feature/linking/requirelinking/requirement/parser/ParsedRequirements.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.discordsrv.common.linking.requirelinking.requirement.parser; +package com.discordsrv.common.feature.linking.requirelinking.requirement.parser; -import com.discordsrv.common.linking.requirelinking.requirement.Requirement; -import com.discordsrv.common.someone.Someone; +import com.discordsrv.common.feature.linking.requirelinking.requirement.Requirement; +import com.discordsrv.common.helper.Someone; import java.util.List; import java.util.concurrent.CompletableFuture; diff --git a/common/src/main/java/com/discordsrv/common/linking/requirelinking/requirement/parser/RequirementParser.java b/common/src/main/java/com/discordsrv/common/feature/linking/requirelinking/requirement/parser/RequirementParser.java similarity index 95% rename from common/src/main/java/com/discordsrv/common/linking/requirelinking/requirement/parser/RequirementParser.java rename to common/src/main/java/com/discordsrv/common/feature/linking/requirelinking/requirement/parser/RequirementParser.java index 9ed31b2e..73e89ed1 100644 --- a/common/src/main/java/com/discordsrv/common/linking/requirelinking/requirement/parser/RequirementParser.java +++ b/common/src/main/java/com/discordsrv/common/feature/linking/requirelinking/requirement/parser/RequirementParser.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package com.discordsrv.common.linking.requirelinking.requirement.parser; +package com.discordsrv.common.feature.linking.requirelinking.requirement.parser; -import com.discordsrv.common.future.util.CompletableFutureUtil; -import com.discordsrv.common.linking.requirelinking.requirement.Requirement; -import com.discordsrv.common.linking.requirelinking.requirement.RequirementType; -import com.discordsrv.common.someone.Someone; +import com.discordsrv.common.feature.linking.requirelinking.requirement.Requirement; +import com.discordsrv.common.feature.linking.requirelinking.requirement.RequirementType; +import com.discordsrv.common.helper.Someone; +import com.discordsrv.common.util.CompletableFutureUtil; import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; diff --git a/common/src/main/java/com/discordsrv/common/linking/requirelinking/requirement/type/DiscordBoostingRequirementType.java b/common/src/main/java/com/discordsrv/common/feature/linking/requirelinking/requirement/type/DiscordBoostingRequirementType.java similarity index 88% rename from common/src/main/java/com/discordsrv/common/linking/requirelinking/requirement/type/DiscordBoostingRequirementType.java rename to common/src/main/java/com/discordsrv/common/feature/linking/requirelinking/requirement/type/DiscordBoostingRequirementType.java index 68d02eb0..881eb764 100644 --- a/common/src/main/java/com/discordsrv/common/linking/requirelinking/requirement/type/DiscordBoostingRequirementType.java +++ b/common/src/main/java/com/discordsrv/common/feature/linking/requirelinking/requirement/type/DiscordBoostingRequirementType.java @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package com.discordsrv.common.linking.requirelinking.requirement.type; +package com.discordsrv.common.feature.linking.requirelinking.requirement.type; import com.discordsrv.api.discord.entity.guild.DiscordGuild; -import com.discordsrv.api.event.bus.Subscribe; +import com.discordsrv.api.eventbus.Subscribe; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.linking.requirelinking.RequiredLinkingModule; -import com.discordsrv.common.someone.Someone; +import com.discordsrv.common.feature.linking.requirelinking.RequiredLinkingModule; +import com.discordsrv.common.helper.Someone; import net.dv8tion.jda.api.events.guild.member.update.GuildMemberUpdateBoostTimeEvent; import java.util.concurrent.CompletableFuture; diff --git a/common/src/main/java/com/discordsrv/common/linking/requirelinking/requirement/type/DiscordRoleRequirementType.java b/common/src/main/java/com/discordsrv/common/feature/linking/requirelinking/requirement/type/DiscordRoleRequirementType.java similarity index 82% rename from common/src/main/java/com/discordsrv/common/linking/requirelinking/requirement/type/DiscordRoleRequirementType.java rename to common/src/main/java/com/discordsrv/common/feature/linking/requirelinking/requirement/type/DiscordRoleRequirementType.java index fca86106..e2f5734e 100644 --- a/common/src/main/java/com/discordsrv/common/linking/requirelinking/requirement/type/DiscordRoleRequirementType.java +++ b/common/src/main/java/com/discordsrv/common/feature/linking/requirelinking/requirement/type/DiscordRoleRequirementType.java @@ -16,15 +16,15 @@ * along with this program. If not, see . */ -package com.discordsrv.common.linking.requirelinking.requirement.type; +package com.discordsrv.common.feature.linking.requirelinking.requirement.type; import com.discordsrv.api.discord.entity.guild.DiscordRole; -import com.discordsrv.api.event.bus.Subscribe; -import com.discordsrv.api.event.events.discord.member.role.AbstractDiscordMemberRoleChangeEvent; -import com.discordsrv.api.event.events.discord.member.role.DiscordMemberRoleAddEvent; +import com.discordsrv.api.eventbus.Subscribe; +import com.discordsrv.api.events.discord.member.role.AbstractDiscordMemberRoleChangeEvent; +import com.discordsrv.api.events.discord.member.role.DiscordMemberRoleAddEvent; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.linking.requirelinking.RequiredLinkingModule; -import com.discordsrv.common.someone.Someone; +import com.discordsrv.common.feature.linking.requirelinking.RequiredLinkingModule; +import com.discordsrv.common.helper.Someone; import java.util.concurrent.CompletableFuture; diff --git a/common/src/main/java/com/discordsrv/common/linking/requirelinking/requirement/type/DiscordServerRequirementType.java b/common/src/main/java/com/discordsrv/common/feature/linking/requirelinking/requirement/type/DiscordServerRequirementType.java similarity index 89% rename from common/src/main/java/com/discordsrv/common/linking/requirelinking/requirement/type/DiscordServerRequirementType.java rename to common/src/main/java/com/discordsrv/common/feature/linking/requirelinking/requirement/type/DiscordServerRequirementType.java index 668e3d36..fd139476 100644 --- a/common/src/main/java/com/discordsrv/common/linking/requirelinking/requirement/type/DiscordServerRequirementType.java +++ b/common/src/main/java/com/discordsrv/common/feature/linking/requirelinking/requirement/type/DiscordServerRequirementType.java @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package com.discordsrv.common.linking.requirelinking.requirement.type; +package com.discordsrv.common.feature.linking.requirelinking.requirement.type; import com.discordsrv.api.discord.entity.guild.DiscordGuild; -import com.discordsrv.api.event.bus.Subscribe; +import com.discordsrv.api.eventbus.Subscribe; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.linking.requirelinking.RequiredLinkingModule; -import com.discordsrv.common.someone.Someone; +import com.discordsrv.common.feature.linking.requirelinking.RequiredLinkingModule; +import com.discordsrv.common.helper.Someone; import net.dv8tion.jda.api.events.guild.member.GuildMemberJoinEvent; import net.dv8tion.jda.api.events.guild.member.GuildMemberRemoveEvent; diff --git a/common/src/main/java/com/discordsrv/common/linking/requirelinking/requirement/type/LongRequirementType.java b/common/src/main/java/com/discordsrv/common/feature/linking/requirelinking/requirement/type/LongRequirementType.java similarity index 83% rename from common/src/main/java/com/discordsrv/common/linking/requirelinking/requirement/type/LongRequirementType.java rename to common/src/main/java/com/discordsrv/common/feature/linking/requirelinking/requirement/type/LongRequirementType.java index 3c280857..e352fc03 100644 --- a/common/src/main/java/com/discordsrv/common/linking/requirelinking/requirement/type/LongRequirementType.java +++ b/common/src/main/java/com/discordsrv/common/feature/linking/requirelinking/requirement/type/LongRequirementType.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.discordsrv.common.linking.requirelinking.requirement.type; +package com.discordsrv.common.feature.linking.requirelinking.requirement.type; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.linking.requirelinking.RequiredLinkingModule; -import com.discordsrv.common.linking.requirelinking.requirement.RequirementType; +import com.discordsrv.common.feature.linking.requirelinking.RequiredLinkingModule; +import com.discordsrv.common.feature.linking.requirelinking.requirement.RequirementType; public abstract class LongRequirementType extends RequirementType { diff --git a/common/src/main/java/com/discordsrv/common/linking/requirelinking/requirement/type/MinecraftAuthRequirementType.java b/common/src/main/java/com/discordsrv/common/feature/linking/requirelinking/requirement/type/MinecraftAuthRequirementType.java similarity index 95% rename from common/src/main/java/com/discordsrv/common/linking/requirelinking/requirement/type/MinecraftAuthRequirementType.java rename to common/src/main/java/com/discordsrv/common/feature/linking/requirelinking/requirement/type/MinecraftAuthRequirementType.java index 53899c90..9eabdbaf 100644 --- a/common/src/main/java/com/discordsrv/common/linking/requirelinking/requirement/type/MinecraftAuthRequirementType.java +++ b/common/src/main/java/com/discordsrv/common/feature/linking/requirelinking/requirement/type/MinecraftAuthRequirementType.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package com.discordsrv.common.linking.requirelinking.requirement.type; +package com.discordsrv.common.feature.linking.requirelinking.requirement.type; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.linking.requirelinking.RequiredLinkingModule; -import com.discordsrv.common.linking.requirelinking.requirement.RequirementType; -import com.discordsrv.common.someone.Someone; +import com.discordsrv.common.feature.linking.requirelinking.RequiredLinkingModule; +import com.discordsrv.common.feature.linking.requirelinking.requirement.RequirementType; +import com.discordsrv.common.helper.Someone; import me.minecraftauth.lib.AuthService; import me.minecraftauth.lib.account.platform.twitch.SubTier; import me.minecraftauth.lib.exception.LookupException; diff --git a/common/src/main/java/com/discordsrv/common/messageforwarding/discord/DiscordChatMessageModule.java b/common/src/main/java/com/discordsrv/common/feature/messageforwarding/discord/DiscordChatMessageModule.java similarity index 92% rename from common/src/main/java/com/discordsrv/common/messageforwarding/discord/DiscordChatMessageModule.java rename to common/src/main/java/com/discordsrv/common/feature/messageforwarding/discord/DiscordChatMessageModule.java index 123a4baa..c9a985a9 100644 --- a/common/src/main/java/com/discordsrv/common/messageforwarding/discord/DiscordChatMessageModule.java +++ b/common/src/main/java/com/discordsrv/common/feature/messageforwarding/discord/DiscordChatMessageModule.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.messageforwarding.discord; +package com.discordsrv.common.feature.messageforwarding.discord; import com.discordsrv.api.channel.GameChannel; import com.discordsrv.api.component.GameTextBuilder; @@ -27,23 +27,23 @@ import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel; import com.discordsrv.api.discord.entity.guild.DiscordGuild; import com.discordsrv.api.discord.entity.guild.DiscordGuildMember; import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessage; -import com.discordsrv.api.event.bus.Subscribe; -import com.discordsrv.api.event.events.discord.message.DiscordMessageDeleteEvent; -import com.discordsrv.api.event.events.discord.message.DiscordMessageReceiveEvent; -import com.discordsrv.api.event.events.discord.message.DiscordMessageUpdateEvent; -import com.discordsrv.api.event.events.message.forward.discord.DiscordChatMessageForwardedEvent; -import com.discordsrv.api.event.events.message.process.discord.DiscordChatMessageProcessEvent; -import com.discordsrv.api.event.events.message.receive.discord.DiscordChatMessageReceiveEvent; +import com.discordsrv.api.eventbus.Subscribe; +import com.discordsrv.api.events.discord.message.DiscordMessageDeleteEvent; +import com.discordsrv.api.events.discord.message.DiscordMessageReceiveEvent; +import com.discordsrv.api.events.discord.message.DiscordMessageUpdateEvent; +import com.discordsrv.api.events.message.forward.discord.DiscordChatMessageForwardedEvent; +import com.discordsrv.api.events.message.process.discord.DiscordChatMessageProcessEvent; +import com.discordsrv.api.events.message.receive.discord.DiscordChatMessageReceiveEvent; import com.discordsrv.api.placeholder.util.Placeholders; import com.discordsrv.api.player.DiscordSRVPlayer; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.component.renderer.DiscordSRVMinecraftRenderer; -import com.discordsrv.common.component.util.ComponentUtil; import com.discordsrv.common.config.main.channels.DiscordToMinecraftChatConfig; import com.discordsrv.common.config.main.channels.base.BaseChannelConfig; import com.discordsrv.common.config.main.generic.DiscordIgnoresConfig; -import com.discordsrv.common.logging.NamedLogger; -import com.discordsrv.common.module.type.AbstractModule; +import com.discordsrv.common.core.component.renderer.DiscordSRVMinecraftRenderer; +import com.discordsrv.common.core.logging.NamedLogger; +import com.discordsrv.common.core.module.type.AbstractModule; +import com.discordsrv.common.util.ComponentUtil; import net.kyori.adventure.text.Component; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; diff --git a/common/src/main/java/com/discordsrv/common/messageforwarding/discord/DiscordMessageMirroringModule.java b/common/src/main/java/com/discordsrv/common/feature/messageforwarding/discord/DiscordMessageMirroringModule.java similarity index 97% rename from common/src/main/java/com/discordsrv/common/messageforwarding/discord/DiscordMessageMirroringModule.java rename to common/src/main/java/com/discordsrv/common/feature/messageforwarding/discord/DiscordMessageMirroringModule.java index 66c13e6a..d786000a 100644 --- a/common/src/main/java/com/discordsrv/common/messageforwarding/discord/DiscordMessageMirroringModule.java +++ b/common/src/main/java/com/discordsrv/common/feature/messageforwarding/discord/DiscordMessageMirroringModule.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.messageforwarding.discord; +package com.discordsrv.common.feature.messageforwarding.discord; import com.discordsrv.api.channel.GameChannel; import com.discordsrv.api.discord.connection.details.DiscordGatewayIntent; @@ -29,11 +29,11 @@ import com.discordsrv.api.discord.entity.guild.DiscordGuildMember; import com.discordsrv.api.discord.entity.message.DiscordMessageEmbed; import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessage; import com.discordsrv.api.discord.entity.message.SendableDiscordMessage; -import com.discordsrv.api.event.bus.Subscribe; -import com.discordsrv.api.event.events.discord.message.DiscordMessageDeleteEvent; -import com.discordsrv.api.event.events.discord.message.DiscordMessageUpdateEvent; -import com.discordsrv.api.event.events.message.forward.game.AbstractGameMessageForwardedEvent; -import com.discordsrv.api.event.events.message.receive.discord.DiscordChatMessageReceiveEvent; +import com.discordsrv.api.eventbus.Subscribe; +import com.discordsrv.api.events.discord.message.DiscordMessageDeleteEvent; +import com.discordsrv.api.events.discord.message.DiscordMessageUpdateEvent; +import com.discordsrv.api.events.message.forward.game.AbstractGameMessageForwardedEvent; +import com.discordsrv.api.events.message.receive.discord.DiscordChatMessageReceiveEvent; import com.discordsrv.api.placeholder.format.PlainPlaceholderFormat; import com.discordsrv.api.placeholder.provider.SinglePlaceholder; import com.discordsrv.common.DiscordSRV; @@ -41,10 +41,10 @@ import com.discordsrv.common.config.main.channels.MirroringConfig; import com.discordsrv.common.config.main.channels.base.BaseChannelConfig; import com.discordsrv.common.config.main.channels.base.IChannelConfig; import com.discordsrv.common.config.main.generic.DiscordIgnoresConfig; -import com.discordsrv.common.discord.util.DiscordPermissionUtil; -import com.discordsrv.common.future.util.CompletableFutureUtil; -import com.discordsrv.common.logging.NamedLogger; -import com.discordsrv.common.module.type.AbstractModule; +import com.discordsrv.common.core.logging.NamedLogger; +import com.discordsrv.common.core.module.type.AbstractModule; +import com.discordsrv.common.util.CompletableFutureUtil; +import com.discordsrv.common.util.DiscordPermissionUtil; import com.github.benmanes.caffeine.cache.Cache; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Message; diff --git a/common/src/main/java/com/discordsrv/common/messageforwarding/game/AbstractGameMessageModule.java b/common/src/main/java/com/discordsrv/common/feature/messageforwarding/game/AbstractGameMessageModule.java similarity index 95% rename from common/src/main/java/com/discordsrv/common/messageforwarding/game/AbstractGameMessageModule.java rename to common/src/main/java/com/discordsrv/common/feature/messageforwarding/game/AbstractGameMessageModule.java index bfbcbe86..9dbc10dd 100644 --- a/common/src/main/java/com/discordsrv/common/messageforwarding/game/AbstractGameMessageModule.java +++ b/common/src/main/java/com/discordsrv/common/feature/messageforwarding/game/AbstractGameMessageModule.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.messageforwarding.game; +package com.discordsrv.common.feature.messageforwarding.game; import com.discordsrv.api.channel.GameChannel; import com.discordsrv.api.discord.connection.jda.errorresponse.ErrorCallbackContext; @@ -26,19 +26,19 @@ import com.discordsrv.api.discord.entity.channel.DiscordThreadChannel; import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessage; import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster; import com.discordsrv.api.discord.entity.message.SendableDiscordMessage; -import com.discordsrv.api.event.events.message.receive.game.AbstractGameMessageReceiveEvent; +import com.discordsrv.api.events.message.receive.game.AbstractGameMessageReceiveEvent; import com.discordsrv.api.player.DiscordSRVPlayer; import com.discordsrv.common.DiscordSRV; +import com.discordsrv.common.abstraction.player.IPlayer; import com.discordsrv.common.config.main.channels.base.BaseChannelConfig; import com.discordsrv.common.config.main.channels.base.IChannelConfig; import com.discordsrv.common.config.main.generic.IMessageConfig; +import com.discordsrv.common.core.logging.NamedLogger; +import com.discordsrv.common.core.module.type.AbstractModule; import com.discordsrv.common.discord.api.entity.message.ReceivedDiscordMessageClusterImpl; -import com.discordsrv.common.discord.util.DiscordPermissionUtil; -import com.discordsrv.common.future.util.CompletableFutureUtil; -import com.discordsrv.common.logging.NamedLogger; -import com.discordsrv.common.module.type.AbstractModule; -import com.discordsrv.common.player.IPlayer; -import com.discordsrv.common.testing.TestHelper; +import com.discordsrv.common.helper.TestHelper; +import com.discordsrv.common.util.CompletableFutureUtil; +import com.discordsrv.common.util.DiscordPermissionUtil; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel; import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel; diff --git a/common/src/main/java/com/discordsrv/common/messageforwarding/game/AwardMessageModule.java b/common/src/main/java/com/discordsrv/common/feature/messageforwarding/game/AwardMessageModule.java similarity index 91% rename from common/src/main/java/com/discordsrv/common/messageforwarding/game/AwardMessageModule.java rename to common/src/main/java/com/discordsrv/common/feature/messageforwarding/game/AwardMessageModule.java index 985a0ea0..3f88606a 100644 --- a/common/src/main/java/com/discordsrv/common/messageforwarding/game/AwardMessageModule.java +++ b/common/src/main/java/com/discordsrv/common/feature/messageforwarding/game/AwardMessageModule.java @@ -16,22 +16,22 @@ * along with this program. If not, see . */ -package com.discordsrv.common.messageforwarding.game; +package com.discordsrv.common.feature.messageforwarding.game; import com.discordsrv.api.channel.GameChannel; import com.discordsrv.api.component.MinecraftComponent; import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster; import com.discordsrv.api.discord.entity.message.SendableDiscordMessage; -import com.discordsrv.api.event.bus.EventPriority; -import com.discordsrv.api.event.bus.Subscribe; -import com.discordsrv.api.event.events.message.forward.game.AwardMessageForwardedEvent; -import com.discordsrv.api.event.events.message.receive.game.AwardMessageReceiveEvent; +import com.discordsrv.api.eventbus.EventPriority; +import com.discordsrv.api.eventbus.Subscribe; +import com.discordsrv.api.events.message.forward.game.AwardMessageForwardedEvent; +import com.discordsrv.api.events.message.receive.game.AwardMessageReceiveEvent; import com.discordsrv.api.player.DiscordSRVPlayer; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.component.util.ComponentUtil; import com.discordsrv.common.config.main.channels.base.BaseChannelConfig; import com.discordsrv.common.config.main.channels.base.server.ServerBaseChannelConfig; import com.discordsrv.common.config.main.channels.server.AwardMessageConfig; +import com.discordsrv.common.util.ComponentUtil; import com.github.benmanes.caffeine.cache.Cache; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.NotNull; diff --git a/common/src/main/java/com/discordsrv/common/messageforwarding/game/DeathMessageModule.java b/common/src/main/java/com/discordsrv/common/feature/messageforwarding/game/DeathMessageModule.java similarity index 87% rename from common/src/main/java/com/discordsrv/common/messageforwarding/game/DeathMessageModule.java rename to common/src/main/java/com/discordsrv/common/feature/messageforwarding/game/DeathMessageModule.java index 52918d06..ec116b07 100644 --- a/common/src/main/java/com/discordsrv/common/messageforwarding/game/DeathMessageModule.java +++ b/common/src/main/java/com/discordsrv/common/feature/messageforwarding/game/DeathMessageModule.java @@ -16,21 +16,21 @@ * along with this program. If not, see . */ -package com.discordsrv.common.messageforwarding.game; +package com.discordsrv.common.feature.messageforwarding.game; import com.discordsrv.api.channel.GameChannel; import com.discordsrv.api.component.MinecraftComponent; import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster; import com.discordsrv.api.discord.entity.message.SendableDiscordMessage; -import com.discordsrv.api.event.bus.EventPriority; -import com.discordsrv.api.event.bus.Subscribe; -import com.discordsrv.api.event.events.message.forward.game.DeathMessageForwardedEvent; -import com.discordsrv.api.event.events.message.receive.game.DeathMessageReceiveEvent; +import com.discordsrv.api.eventbus.EventPriority; +import com.discordsrv.api.eventbus.Subscribe; +import com.discordsrv.api.events.message.forward.game.DeathMessageForwardedEvent; +import com.discordsrv.api.events.message.receive.game.DeathMessageReceiveEvent; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.component.util.ComponentUtil; import com.discordsrv.common.config.main.channels.base.BaseChannelConfig; import com.discordsrv.common.config.main.channels.base.server.ServerBaseChannelConfig; import com.discordsrv.common.config.main.channels.server.DeathMessageConfig; +import com.discordsrv.common.util.ComponentUtil; import org.jetbrains.annotations.NotNull; public class DeathMessageModule extends AbstractGameMessageModule { diff --git a/common/src/main/java/com/discordsrv/common/messageforwarding/game/JoinMessageModule.java b/common/src/main/java/com/discordsrv/common/feature/messageforwarding/game/JoinMessageModule.java similarity index 89% rename from common/src/main/java/com/discordsrv/common/messageforwarding/game/JoinMessageModule.java rename to common/src/main/java/com/discordsrv/common/feature/messageforwarding/game/JoinMessageModule.java index a75b43ca..e66a7318 100644 --- a/common/src/main/java/com/discordsrv/common/messageforwarding/game/JoinMessageModule.java +++ b/common/src/main/java/com/discordsrv/common/feature/messageforwarding/game/JoinMessageModule.java @@ -16,23 +16,23 @@ * along with this program. If not, see . */ -package com.discordsrv.common.messageforwarding.game; +package com.discordsrv.common.feature.messageforwarding.game; import com.discordsrv.api.channel.GameChannel; import com.discordsrv.api.component.MinecraftComponent; import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster; import com.discordsrv.api.discord.entity.message.SendableDiscordMessage; -import com.discordsrv.api.event.bus.EventPriority; -import com.discordsrv.api.event.bus.Subscribe; -import com.discordsrv.api.event.events.message.forward.game.JoinMessageForwardedEvent; -import com.discordsrv.api.event.events.message.receive.game.JoinMessageReceiveEvent; +import com.discordsrv.api.eventbus.EventPriority; +import com.discordsrv.api.eventbus.Subscribe; +import com.discordsrv.api.events.message.forward.game.JoinMessageForwardedEvent; +import com.discordsrv.api.events.message.receive.game.JoinMessageReceiveEvent; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.component.util.ComponentUtil; +import com.discordsrv.common.abstraction.player.IPlayer; import com.discordsrv.common.config.main.channels.base.BaseChannelConfig; import com.discordsrv.common.config.main.generic.IMessageConfig; -import com.discordsrv.common.event.events.player.PlayerDisconnectedEvent; -import com.discordsrv.common.permission.Permission; -import com.discordsrv.common.player.IPlayer; +import com.discordsrv.common.events.player.PlayerDisconnectedEvent; +import com.discordsrv.common.permission.game.Permission; +import com.discordsrv.common.util.ComponentUtil; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/com/discordsrv/common/messageforwarding/game/LeaveMessageModule.java b/common/src/main/java/com/discordsrv/common/feature/messageforwarding/game/LeaveMessageModule.java similarity index 90% rename from common/src/main/java/com/discordsrv/common/messageforwarding/game/LeaveMessageModule.java rename to common/src/main/java/com/discordsrv/common/feature/messageforwarding/game/LeaveMessageModule.java index 1c272d2e..40f1b9a5 100644 --- a/common/src/main/java/com/discordsrv/common/messageforwarding/game/LeaveMessageModule.java +++ b/common/src/main/java/com/discordsrv/common/feature/messageforwarding/game/LeaveMessageModule.java @@ -16,23 +16,23 @@ * along with this program. If not, see . */ -package com.discordsrv.common.messageforwarding.game; +package com.discordsrv.common.feature.messageforwarding.game; import com.discordsrv.api.channel.GameChannel; import com.discordsrv.api.component.MinecraftComponent; import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster; import com.discordsrv.api.discord.entity.message.SendableDiscordMessage; -import com.discordsrv.api.event.bus.EventPriority; -import com.discordsrv.api.event.bus.Subscribe; -import com.discordsrv.api.event.events.message.forward.game.LeaveMessageForwardedEvent; -import com.discordsrv.api.event.events.message.receive.game.LeaveMessageReceiveEvent; +import com.discordsrv.api.eventbus.EventPriority; +import com.discordsrv.api.eventbus.Subscribe; +import com.discordsrv.api.events.message.forward.game.LeaveMessageForwardedEvent; +import com.discordsrv.api.events.message.receive.game.LeaveMessageReceiveEvent; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.component.util.ComponentUtil; +import com.discordsrv.common.abstraction.player.IPlayer; import com.discordsrv.common.config.main.channels.LeaveMessageConfig; import com.discordsrv.common.config.main.channels.base.BaseChannelConfig; -import com.discordsrv.common.event.events.player.PlayerConnectedEvent; -import com.discordsrv.common.permission.Permission; -import com.discordsrv.common.player.IPlayer; +import com.discordsrv.common.events.player.PlayerConnectedEvent; +import com.discordsrv.common.permission.game.Permission; +import com.discordsrv.common.util.ComponentUtil; import net.kyori.adventure.text.Component; import org.apache.commons.lang3.tuple.Pair; import org.jetbrains.annotations.NotNull; diff --git a/common/src/main/java/com/discordsrv/common/messageforwarding/game/ServerSwitchMessageModule.java b/common/src/main/java/com/discordsrv/common/feature/messageforwarding/game/ServerSwitchMessageModule.java similarity index 87% rename from common/src/main/java/com/discordsrv/common/messageforwarding/game/ServerSwitchMessageModule.java rename to common/src/main/java/com/discordsrv/common/feature/messageforwarding/game/ServerSwitchMessageModule.java index 35e19579..cfde4e03 100644 --- a/common/src/main/java/com/discordsrv/common/messageforwarding/game/ServerSwitchMessageModule.java +++ b/common/src/main/java/com/discordsrv/common/feature/messageforwarding/game/ServerSwitchMessageModule.java @@ -16,21 +16,21 @@ * along with this program. If not, see . */ -package com.discordsrv.common.messageforwarding.game; +package com.discordsrv.common.feature.messageforwarding.game; import com.discordsrv.api.channel.GameChannel; import com.discordsrv.api.component.MinecraftComponent; import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster; import com.discordsrv.api.discord.entity.message.SendableDiscordMessage; -import com.discordsrv.api.event.bus.EventPriority; -import com.discordsrv.api.event.bus.Subscribe; -import com.discordsrv.api.event.events.message.forward.game.ServerSwitchMessageForwardedEvent; -import com.discordsrv.api.event.events.message.receive.game.ServerSwitchMessageReceiveEvent; +import com.discordsrv.api.eventbus.EventPriority; +import com.discordsrv.api.eventbus.Subscribe; +import com.discordsrv.api.events.message.forward.game.ServerSwitchMessageForwardedEvent; +import com.discordsrv.api.events.message.receive.game.ServerSwitchMessageReceiveEvent; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.component.util.ComponentUtil; import com.discordsrv.common.config.main.channels.base.BaseChannelConfig; import com.discordsrv.common.config.main.channels.base.proxy.ProxyBaseChannelConfig; import com.discordsrv.common.config.main.channels.proxy.ServerSwitchMessageConfig; +import com.discordsrv.common.util.ComponentUtil; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.NotNull; diff --git a/common/src/main/java/com/discordsrv/common/messageforwarding/game/StartMessageModule.java b/common/src/main/java/com/discordsrv/common/feature/messageforwarding/game/StartMessageModule.java similarity index 93% rename from common/src/main/java/com/discordsrv/common/messageforwarding/game/StartMessageModule.java rename to common/src/main/java/com/discordsrv/common/feature/messageforwarding/game/StartMessageModule.java index 3362192d..4abe9c74 100644 --- a/common/src/main/java/com/discordsrv/common/messageforwarding/game/StartMessageModule.java +++ b/common/src/main/java/com/discordsrv/common/feature/messageforwarding/game/StartMessageModule.java @@ -16,18 +16,18 @@ * along with this program. If not, see . */ -package com.discordsrv.common.messageforwarding.game; +package com.discordsrv.common.feature.messageforwarding.game; import com.discordsrv.api.channel.GameChannel; import com.discordsrv.api.discord.entity.channel.DiscordGuildMessageChannel; import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessage; import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster; import com.discordsrv.api.discord.entity.message.SendableDiscordMessage; -import com.discordsrv.api.event.events.message.receive.game.AbstractGameMessageReceiveEvent; +import com.discordsrv.api.events.message.receive.game.AbstractGameMessageReceiveEvent; import com.discordsrv.common.DiscordSRV; +import com.discordsrv.common.abstraction.player.IPlayer; import com.discordsrv.common.config.main.channels.StartMessageConfig; import com.discordsrv.common.config.main.channels.base.BaseChannelConfig; -import com.discordsrv.common.player.IPlayer; import org.jetbrains.annotations.NotNull; import java.util.Collection; diff --git a/common/src/main/java/com/discordsrv/common/messageforwarding/game/StopMessageModule.java b/common/src/main/java/com/discordsrv/common/feature/messageforwarding/game/StopMessageModule.java similarity index 94% rename from common/src/main/java/com/discordsrv/common/messageforwarding/game/StopMessageModule.java rename to common/src/main/java/com/discordsrv/common/feature/messageforwarding/game/StopMessageModule.java index e5c4b916..64ec9ba6 100644 --- a/common/src/main/java/com/discordsrv/common/messageforwarding/game/StopMessageModule.java +++ b/common/src/main/java/com/discordsrv/common/feature/messageforwarding/game/StopMessageModule.java @@ -16,18 +16,18 @@ * along with this program. If not, see . */ -package com.discordsrv.common.messageforwarding.game; +package com.discordsrv.common.feature.messageforwarding.game; import com.discordsrv.api.channel.GameChannel; import com.discordsrv.api.discord.entity.channel.DiscordGuildMessageChannel; import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessage; import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster; import com.discordsrv.api.discord.entity.message.SendableDiscordMessage; -import com.discordsrv.api.event.events.message.receive.game.AbstractGameMessageReceiveEvent; +import com.discordsrv.api.events.message.receive.game.AbstractGameMessageReceiveEvent; import com.discordsrv.common.DiscordSRV; +import com.discordsrv.common.abstraction.player.IPlayer; import com.discordsrv.common.config.main.channels.StopMessageConfig; import com.discordsrv.common.config.main.channels.base.BaseChannelConfig; -import com.discordsrv.common.player.IPlayer; import org.jetbrains.annotations.NotNull; import java.util.Collection; diff --git a/common/src/main/java/com/discordsrv/common/messageforwarding/game/minecrafttodiscord/MentionCachingModule.java b/common/src/main/java/com/discordsrv/common/feature/messageforwarding/game/minecrafttodiscord/MentionCachingModule.java similarity index 98% rename from common/src/main/java/com/discordsrv/common/messageforwarding/game/minecrafttodiscord/MentionCachingModule.java rename to common/src/main/java/com/discordsrv/common/feature/messageforwarding/game/minecrafttodiscord/MentionCachingModule.java index c20705f4..8b73d3c7 100644 --- a/common/src/main/java/com/discordsrv/common/messageforwarding/game/minecrafttodiscord/MentionCachingModule.java +++ b/common/src/main/java/com/discordsrv/common/feature/messageforwarding/game/minecrafttodiscord/MentionCachingModule.java @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package com.discordsrv.common.messageforwarding.game.minecrafttodiscord; +package com.discordsrv.common.feature.messageforwarding.game.minecrafttodiscord; import com.discordsrv.api.discord.connection.details.DiscordGatewayIntent; -import com.discordsrv.api.event.bus.Subscribe; +import com.discordsrv.api.eventbus.Subscribe; import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.config.main.channels.MinecraftToDiscordChatConfig; import com.discordsrv.common.config.main.channels.base.BaseChannelConfig; -import com.discordsrv.common.module.type.AbstractModule; +import com.discordsrv.common.core.module.type.AbstractModule; import com.github.benmanes.caffeine.cache.Cache; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; diff --git a/common/src/main/java/com/discordsrv/common/messageforwarding/game/minecrafttodiscord/MinecraftToDiscordChatModule.java b/common/src/main/java/com/discordsrv/common/feature/messageforwarding/game/minecrafttodiscord/MinecraftToDiscordChatModule.java similarity index 94% rename from common/src/main/java/com/discordsrv/common/messageforwarding/game/minecrafttodiscord/MinecraftToDiscordChatModule.java rename to common/src/main/java/com/discordsrv/common/feature/messageforwarding/game/minecrafttodiscord/MinecraftToDiscordChatModule.java index 839092e2..3d5da430 100644 --- a/common/src/main/java/com/discordsrv/common/messageforwarding/game/minecrafttodiscord/MinecraftToDiscordChatModule.java +++ b/common/src/main/java/com/discordsrv/common/feature/messageforwarding/game/minecrafttodiscord/MinecraftToDiscordChatModule.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.messageforwarding.game.minecrafttodiscord; +package com.discordsrv.common.feature.messageforwarding.game.minecrafttodiscord; import com.discordsrv.api.channel.GameChannel; import com.discordsrv.api.discord.entity.channel.DiscordGuildMessageChannel; @@ -26,20 +26,20 @@ import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessage; import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster; import com.discordsrv.api.discord.entity.message.SendableDiscordMessage; import com.discordsrv.api.discord.util.DiscordFormattingUtil; -import com.discordsrv.api.event.bus.EventPriority; -import com.discordsrv.api.event.bus.Subscribe; -import com.discordsrv.api.event.events.message.forward.game.GameChatMessageForwardedEvent; -import com.discordsrv.api.event.events.message.receive.game.GameChatMessageReceiveEvent; +import com.discordsrv.api.eventbus.EventPriority; +import com.discordsrv.api.eventbus.Subscribe; +import com.discordsrv.api.events.message.forward.game.GameChatMessageForwardedEvent; +import com.discordsrv.api.events.message.receive.game.GameChatMessageReceiveEvent; import com.discordsrv.api.placeholder.format.FormattedText; import com.discordsrv.api.placeholder.util.Placeholders; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.component.util.ComponentUtil; +import com.discordsrv.common.abstraction.player.IPlayer; import com.discordsrv.common.config.main.channels.MinecraftToDiscordChatConfig; import com.discordsrv.common.config.main.channels.base.BaseChannelConfig; -import com.discordsrv.common.future.util.CompletableFutureUtil; -import com.discordsrv.common.messageforwarding.game.AbstractGameMessageModule; -import com.discordsrv.common.permission.Permission; -import com.discordsrv.common.player.IPlayer; +import com.discordsrv.common.feature.messageforwarding.game.AbstractGameMessageModule; +import com.discordsrv.common.permission.game.Permission; +import com.discordsrv.common.util.CompletableFutureUtil; +import com.discordsrv.common.util.ComponentUtil; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Role; import net.kyori.adventure.text.Component; diff --git a/common/src/main/java/com/discordsrv/common/profile/Profile.java b/common/src/main/java/com/discordsrv/common/feature/profile/Profile.java similarity index 96% rename from common/src/main/java/com/discordsrv/common/profile/Profile.java rename to common/src/main/java/com/discordsrv/common/feature/profile/Profile.java index 908a27ec..2b405e46 100644 --- a/common/src/main/java/com/discordsrv/common/profile/Profile.java +++ b/common/src/main/java/com/discordsrv/common/feature/profile/Profile.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.profile; +package com.discordsrv.common.feature.profile; import com.discordsrv.api.profile.IProfile; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/com/discordsrv/common/profile/ProfileManager.java b/common/src/main/java/com/discordsrv/common/feature/profile/ProfileManager.java similarity index 98% rename from common/src/main/java/com/discordsrv/common/profile/ProfileManager.java rename to common/src/main/java/com/discordsrv/common/feature/profile/ProfileManager.java index 57d9db56..7adbace6 100644 --- a/common/src/main/java/com/discordsrv/common/profile/ProfileManager.java +++ b/common/src/main/java/com/discordsrv/common/feature/profile/ProfileManager.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.profile; +package com.discordsrv.common.feature.profile; import com.discordsrv.api.profile.IProfileManager; import com.discordsrv.common.DiscordSRV; diff --git a/common/src/main/java/com/discordsrv/common/update/UpdateChecker.java b/common/src/main/java/com/discordsrv/common/feature/update/UpdateChecker.java similarity index 95% rename from common/src/main/java/com/discordsrv/common/update/UpdateChecker.java rename to common/src/main/java/com/discordsrv/common/feature/update/UpdateChecker.java index 879ad3d3..fa5a298b 100644 --- a/common/src/main/java/com/discordsrv/common/update/UpdateChecker.java +++ b/common/src/main/java/com/discordsrv/common/feature/update/UpdateChecker.java @@ -16,21 +16,21 @@ * along with this program. If not, see . */ -package com.discordsrv.common.update; +package com.discordsrv.common.feature.update; -import com.discordsrv.api.event.bus.Subscribe; +import com.discordsrv.api.eventbus.Subscribe; import com.discordsrv.common.DiscordSRV; +import com.discordsrv.common.abstraction.player.IPlayer; import com.discordsrv.common.config.connection.ConnectionConfig; import com.discordsrv.common.config.connection.UpdateConfig; -import com.discordsrv.common.debug.data.VersionInfo; -import com.discordsrv.common.event.events.player.PlayerConnectedEvent; +import com.discordsrv.common.core.logging.NamedLogger; +import com.discordsrv.common.events.player.PlayerConnectedEvent; import com.discordsrv.common.exception.MessageException; -import com.discordsrv.common.http.util.HttpUtil; -import com.discordsrv.common.logging.NamedLogger; -import com.discordsrv.common.permission.Permission; -import com.discordsrv.common.player.IPlayer; -import com.discordsrv.common.update.github.GitHubCompareResponse; -import com.discordsrv.common.update.github.GithubRelease; +import com.discordsrv.common.feature.debug.data.VersionInfo; +import com.discordsrv.common.feature.update.github.GitHubCompareResponse; +import com.discordsrv.common.feature.update.github.GithubRelease; +import com.discordsrv.common.permission.game.Permission; +import com.discordsrv.common.util.HttpUtil; import com.fasterxml.jackson.core.type.TypeReference; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.event.ClickEvent; diff --git a/common/src/main/java/com/discordsrv/common/update/VersionCheck.java b/common/src/main/java/com/discordsrv/common/feature/update/VersionCheck.java similarity index 96% rename from common/src/main/java/com/discordsrv/common/update/VersionCheck.java rename to common/src/main/java/com/discordsrv/common/feature/update/VersionCheck.java index 3d560fec..bd09c12f 100644 --- a/common/src/main/java/com/discordsrv/common/update/VersionCheck.java +++ b/common/src/main/java/com/discordsrv/common/feature/update/VersionCheck.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.update; +package com.discordsrv.common.feature.update; import java.util.List; diff --git a/common/src/main/java/com/discordsrv/common/update/github/GitHubCompareResponse.java b/common/src/main/java/com/discordsrv/common/feature/update/github/GitHubCompareResponse.java similarity index 94% rename from common/src/main/java/com/discordsrv/common/update/github/GitHubCompareResponse.java rename to common/src/main/java/com/discordsrv/common/feature/update/github/GitHubCompareResponse.java index 2010d3d8..af091682 100644 --- a/common/src/main/java/com/discordsrv/common/update/github/GitHubCompareResponse.java +++ b/common/src/main/java/com/discordsrv/common/feature/update/github/GitHubCompareResponse.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.update.github; +package com.discordsrv.common.feature.update.github; public class GitHubCompareResponse { diff --git a/common/src/main/java/com/discordsrv/common/update/github/GithubRelease.java b/common/src/main/java/com/discordsrv/common/feature/update/github/GithubRelease.java similarity index 94% rename from common/src/main/java/com/discordsrv/common/update/github/GithubRelease.java rename to common/src/main/java/com/discordsrv/common/feature/update/github/GithubRelease.java index 1de4b849..b7bc34cc 100644 --- a/common/src/main/java/com/discordsrv/common/update/github/GithubRelease.java +++ b/common/src/main/java/com/discordsrv/common/feature/update/github/GithubRelease.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.update.github; +package com.discordsrv.common.feature.update.github; public class GithubRelease { diff --git a/common/src/main/java/com/discordsrv/common/channel/ChannelConfigHelper.java b/common/src/main/java/com/discordsrv/common/helper/ChannelConfigHelper.java similarity index 99% rename from common/src/main/java/com/discordsrv/common/channel/ChannelConfigHelper.java rename to common/src/main/java/com/discordsrv/common/helper/ChannelConfigHelper.java index 80d790ea..caa27604 100644 --- a/common/src/main/java/com/discordsrv/common/channel/ChannelConfigHelper.java +++ b/common/src/main/java/com/discordsrv/common/helper/ChannelConfigHelper.java @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package com.discordsrv.common.channel; +package com.discordsrv.common.helper; import com.discordsrv.api.channel.GameChannel; import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel; import com.discordsrv.api.discord.entity.channel.DiscordTextChannel; import com.discordsrv.api.discord.entity.channel.DiscordThreadChannel; -import com.discordsrv.api.event.events.channel.GameChannelLookupEvent; +import com.discordsrv.api.events.channel.GameChannelLookupEvent; import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.config.configurate.manager.MainConfigManager; import com.discordsrv.common.config.main.channels.base.BaseChannelConfig; diff --git a/common/src/main/java/com/discordsrv/common/destination/DestinationLookupHelper.java b/common/src/main/java/com/discordsrv/common/helper/DestinationLookupHelper.java similarity index 98% rename from common/src/main/java/com/discordsrv/common/destination/DestinationLookupHelper.java rename to common/src/main/java/com/discordsrv/common/helper/DestinationLookupHelper.java index 8add7ca6..0c9b3345 100644 --- a/common/src/main/java/com/discordsrv/common/destination/DestinationLookupHelper.java +++ b/common/src/main/java/com/discordsrv/common/helper/DestinationLookupHelper.java @@ -16,16 +16,16 @@ * along with this program. If not, see . */ -package com.discordsrv.common.destination; +package com.discordsrv.common.helper; import com.discordsrv.api.discord.entity.channel.*; import com.discordsrv.api.discord.entity.message.SendableDiscordMessage; import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.config.main.generic.DestinationConfig; import com.discordsrv.common.config.main.generic.ThreadConfig; -import com.discordsrv.common.discord.util.DiscordPermissionUtil; -import com.discordsrv.common.logging.Logger; -import com.discordsrv.common.logging.NamedLogger; +import com.discordsrv.common.core.logging.Logger; +import com.discordsrv.common.core.logging.NamedLogger; +import com.discordsrv.common.util.DiscordPermissionUtil; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.channel.attribute.IThreadContainer; import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel; diff --git a/common/src/main/java/com/discordsrv/common/someone/Someone.java b/common/src/main/java/com/discordsrv/common/helper/Someone.java similarity index 98% rename from common/src/main/java/com/discordsrv/common/someone/Someone.java rename to common/src/main/java/com/discordsrv/common/helper/Someone.java index 257e8c63..639f3036 100644 --- a/common/src/main/java/com/discordsrv/common/someone/Someone.java +++ b/common/src/main/java/com/discordsrv/common/helper/Someone.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package com.discordsrv.common.someone; +package com.discordsrv.common.helper; import com.discordsrv.api.discord.entity.DiscordUser; import com.discordsrv.api.player.DiscordSRVPlayer; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.profile.Profile; +import com.discordsrv.common.feature.profile.Profile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/com/discordsrv/common/testing/TestHelper.java b/common/src/main/java/com/discordsrv/common/helper/TestHelper.java similarity index 97% rename from common/src/main/java/com/discordsrv/common/testing/TestHelper.java rename to common/src/main/java/com/discordsrv/common/helper/TestHelper.java index 60f6b019..380b4be6 100644 --- a/common/src/main/java/com/discordsrv/common/testing/TestHelper.java +++ b/common/src/main/java/com/discordsrv/common/helper/TestHelper.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.testing; +package com.discordsrv.common.helper; import java.util.function.Consumer; diff --git a/common/src/main/java/com/discordsrv/common/time/util/Timeout.java b/common/src/main/java/com/discordsrv/common/helper/Timeout.java similarity index 97% rename from common/src/main/java/com/discordsrv/common/time/util/Timeout.java rename to common/src/main/java/com/discordsrv/common/helper/Timeout.java index 7be0db18..df04951a 100644 --- a/common/src/main/java/com/discordsrv/common/time/util/Timeout.java +++ b/common/src/main/java/com/discordsrv/common/helper/Timeout.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.time.util; +package com.discordsrv.common.helper; import org.jetbrains.annotations.NotNull; diff --git a/common/src/main/java/com/discordsrv/common/integration/LuckPermsIntegration.java b/common/src/main/java/com/discordsrv/common/integration/LuckPermsIntegration.java index 53d70d7f..d024bc19 100644 --- a/common/src/main/java/com/discordsrv/common/integration/LuckPermsIntegration.java +++ b/common/src/main/java/com/discordsrv/common/integration/LuckPermsIntegration.java @@ -20,11 +20,11 @@ package com.discordsrv.common.integration; import com.discordsrv.api.module.type.PermissionModule; import com.discordsrv.common.DiscordSRV; +import com.discordsrv.common.core.module.type.PluginIntegration; import com.discordsrv.common.exception.MessageException; -import com.discordsrv.common.future.util.CompletableFutureUtil; -import com.discordsrv.common.groupsync.GroupSyncModule; -import com.discordsrv.common.groupsync.enums.GroupSyncCause; -import com.discordsrv.common.module.type.PluginIntegration; +import com.discordsrv.common.feature.groupsync.GroupSyncModule; +import com.discordsrv.common.feature.groupsync.enums.GroupSyncCause; +import com.discordsrv.common.util.CompletableFutureUtil; import net.luckperms.api.LuckPerms; import net.luckperms.api.LuckPermsProvider; import net.luckperms.api.context.ContextSet; diff --git a/common/src/main/java/com/discordsrv/common/permission/Permission.java b/common/src/main/java/com/discordsrv/common/permission/game/Permission.java similarity index 97% rename from common/src/main/java/com/discordsrv/common/permission/Permission.java rename to common/src/main/java/com/discordsrv/common/permission/game/Permission.java index 2a65d5d5..eac4a323 100644 --- a/common/src/main/java/com/discordsrv/common/permission/Permission.java +++ b/common/src/main/java/com/discordsrv/common/permission/game/Permission.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.permission; +package com.discordsrv.common.permission.game; public enum Permission { diff --git a/common/src/main/java/com/discordsrv/common/api/util/ApiInstanceUtil.java b/common/src/main/java/com/discordsrv/common/util/ApiInstanceUtil.java similarity index 97% rename from common/src/main/java/com/discordsrv/common/api/util/ApiInstanceUtil.java rename to common/src/main/java/com/discordsrv/common/util/ApiInstanceUtil.java index bed3e012..434b6749 100644 --- a/common/src/main/java/com/discordsrv/common/api/util/ApiInstanceUtil.java +++ b/common/src/main/java/com/discordsrv/common/util/ApiInstanceUtil.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.api.util; +package com.discordsrv.common.util; import com.discordsrv.api.DiscordSRVApi; import com.discordsrv.common.DiscordSRV; diff --git a/common/src/main/java/com/discordsrv/common/command/util/CommandUtil.java b/common/src/main/java/com/discordsrv/common/util/CommandUtil.java similarity index 97% rename from common/src/main/java/com/discordsrv/common/command/util/CommandUtil.java rename to common/src/main/java/com/discordsrv/common/util/CommandUtil.java index b756b83f..efef309d 100644 --- a/common/src/main/java/com/discordsrv/common/command/util/CommandUtil.java +++ b/common/src/main/java/com/discordsrv/common/util/CommandUtil.java @@ -16,18 +16,17 @@ * along with this program. If not, see . */ -package com.discordsrv.common.command.util; +package com.discordsrv.common.util; import com.discordsrv.common.DiscordSRV; +import com.discordsrv.common.abstraction.player.IPlayer; import com.discordsrv.common.command.combined.abstraction.CommandExecution; import com.discordsrv.common.command.combined.abstraction.DiscordCommandExecution; import com.discordsrv.common.command.combined.abstraction.GameCommandExecution; import com.discordsrv.common.command.game.sender.ICommandSender; import com.discordsrv.common.config.messages.MessagesConfig; -import com.discordsrv.common.logging.Logger; -import com.discordsrv.common.permission.Permission; -import com.discordsrv.common.player.IPlayer; -import com.discordsrv.common.uuid.util.UUIDUtil; +import com.discordsrv.common.core.logging.Logger; +import com.discordsrv.common.permission.game.Permission; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.utils.MiscUtil; diff --git a/common/src/main/java/com/discordsrv/common/future/util/CompletableFutureUtil.java b/common/src/main/java/com/discordsrv/common/util/CompletableFutureUtil.java similarity index 96% rename from common/src/main/java/com/discordsrv/common/future/util/CompletableFutureUtil.java rename to common/src/main/java/com/discordsrv/common/util/CompletableFutureUtil.java index 4e94096d..009981fc 100644 --- a/common/src/main/java/com/discordsrv/common/future/util/CompletableFutureUtil.java +++ b/common/src/main/java/com/discordsrv/common/util/CompletableFutureUtil.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.discordsrv.common.future.util; +package com.discordsrv.common.util; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.function.CheckedRunnable; -import com.discordsrv.common.function.CheckedSupplier; +import com.discordsrv.common.util.function.CheckedRunnable; +import com.discordsrv.common.util.function.CheckedSupplier; import org.jetbrains.annotations.NotNull; import java.time.Duration; diff --git a/common/src/main/java/com/discordsrv/common/component/util/ComponentUtil.java b/common/src/main/java/com/discordsrv/common/util/ComponentUtil.java similarity index 96% rename from common/src/main/java/com/discordsrv/common/component/util/ComponentUtil.java rename to common/src/main/java/com/discordsrv/common/util/ComponentUtil.java index b0ed97eb..daf5c27c 100644 --- a/common/src/main/java/com/discordsrv/common/component/util/ComponentUtil.java +++ b/common/src/main/java/com/discordsrv/common/util/ComponentUtil.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.discordsrv.common.component.util; +package com.discordsrv.common.util; import com.discordsrv.api.component.MinecraftComponent; import com.discordsrv.api.component.MinecraftComponentAdapter; -import com.discordsrv.common.component.MinecraftComponentImpl; +import com.discordsrv.common.core.component.MinecraftComponentImpl; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; diff --git a/common/src/main/java/com/discordsrv/common/discord/util/DiscordPermissionUtil.java b/common/src/main/java/com/discordsrv/common/util/DiscordPermissionUtil.java similarity index 98% rename from common/src/main/java/com/discordsrv/common/discord/util/DiscordPermissionUtil.java rename to common/src/main/java/com/discordsrv/common/util/DiscordPermissionUtil.java index 1882661b..873d6277 100644 --- a/common/src/main/java/com/discordsrv/common/discord/util/DiscordPermissionUtil.java +++ b/common/src/main/java/com/discordsrv/common/util/DiscordPermissionUtil.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.discord.util; +package com.discordsrv.common.util; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Guild; diff --git a/common/src/main/java/com/discordsrv/common/event/util/EventUtil.java b/common/src/main/java/com/discordsrv/common/util/EventUtil.java similarity index 88% rename from common/src/main/java/com/discordsrv/common/event/util/EventUtil.java rename to common/src/main/java/com/discordsrv/common/util/EventUtil.java index cda9db1e..29f3e0de 100644 --- a/common/src/main/java/com/discordsrv/common/event/util/EventUtil.java +++ b/common/src/main/java/com/discordsrv/common/util/EventUtil.java @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package com.discordsrv.common.event.util; +package com.discordsrv.common.util; -import com.discordsrv.api.event.bus.EventListener; -import com.discordsrv.api.event.events.Cancellable; -import com.discordsrv.api.event.events.Processable; +import com.discordsrv.api.eventbus.EventListener; +import com.discordsrv.api.events.Cancellable; +import com.discordsrv.api.events.Processable; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.logging.Logger; +import com.discordsrv.common.core.logging.Logger; public final class EventUtil { diff --git a/common/src/main/java/com/discordsrv/common/exception/util/ExceptionUtil.java b/common/src/main/java/com/discordsrv/common/util/ExceptionUtil.java similarity index 96% rename from common/src/main/java/com/discordsrv/common/exception/util/ExceptionUtil.java rename to common/src/main/java/com/discordsrv/common/util/ExceptionUtil.java index add95ff4..7ccef4c8 100644 --- a/common/src/main/java/com/discordsrv/common/exception/util/ExceptionUtil.java +++ b/common/src/main/java/com/discordsrv/common/util/ExceptionUtil.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.exception.util; +package com.discordsrv.common.util; public final class ExceptionUtil { diff --git a/common/src/main/java/com/discordsrv/common/permission/util/PermissionUtil.java b/common/src/main/java/com/discordsrv/common/util/GamePermissionUtil.java similarity index 96% rename from common/src/main/java/com/discordsrv/common/permission/util/PermissionUtil.java rename to common/src/main/java/com/discordsrv/common/util/GamePermissionUtil.java index d0eecfe9..5dfb5ecd 100644 --- a/common/src/main/java/com/discordsrv/common/permission/util/PermissionUtil.java +++ b/common/src/main/java/com/discordsrv/common/util/GamePermissionUtil.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.permission.util; +package com.discordsrv.common.util; import com.discordsrv.api.module.type.PermissionModule; import com.discordsrv.common.DiscordSRV; @@ -28,12 +28,12 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.function.Function; -public final class PermissionUtil { +public final class GamePermissionUtil { public static final String PREFIX_META_KEY = "discordsrv_prefix"; public static final String SUFFIX_META_KEY = "discordsrv_suffix"; - private PermissionUtil() {} + private GamePermissionUtil() {} public static Component getMetaPrefix(DiscordSRV discordSRV, UUID uuid) { return getMeta(discordSRV, uuid, PREFIX_META_KEY); diff --git a/common/src/main/java/com/discordsrv/common/http/util/HttpUtil.java b/common/src/main/java/com/discordsrv/common/util/HttpUtil.java similarity index 98% rename from common/src/main/java/com/discordsrv/common/http/util/HttpUtil.java rename to common/src/main/java/com/discordsrv/common/util/HttpUtil.java index 1ff7258d..f8ef7e63 100644 --- a/common/src/main/java/com/discordsrv/common/http/util/HttpUtil.java +++ b/common/src/main/java/com/discordsrv/common/util/HttpUtil.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.http.util; +package com.discordsrv.common.util; import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.exception.MessageException; diff --git a/common/src/main/java/com/discordsrv/common/uuid/util/UUIDUtil.java b/common/src/main/java/com/discordsrv/common/util/UUIDUtil.java similarity index 98% rename from common/src/main/java/com/discordsrv/common/uuid/util/UUIDUtil.java rename to common/src/main/java/com/discordsrv/common/util/UUIDUtil.java index 1565addd..a49d4ed5 100644 --- a/common/src/main/java/com/discordsrv/common/uuid/util/UUIDUtil.java +++ b/common/src/main/java/com/discordsrv/common/util/UUIDUtil.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.uuid.util; +package com.discordsrv.common.util; import com.discordsrv.api.placeholder.annotation.Placeholder; import com.discordsrv.api.placeholder.annotation.PlaceholderPrefix; diff --git a/common/src/main/java/com/discordsrv/common/function/CheckedConsumer.java b/common/src/main/java/com/discordsrv/common/util/function/CheckedConsumer.java similarity index 95% rename from common/src/main/java/com/discordsrv/common/function/CheckedConsumer.java rename to common/src/main/java/com/discordsrv/common/util/function/CheckedConsumer.java index 96f5d0ef..305e9d87 100644 --- a/common/src/main/java/com/discordsrv/common/function/CheckedConsumer.java +++ b/common/src/main/java/com/discordsrv/common/util/function/CheckedConsumer.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.function; +package com.discordsrv.common.util.function; @FunctionalInterface public interface CheckedConsumer { diff --git a/common/src/main/java/com/discordsrv/common/function/CheckedFunction.java b/common/src/main/java/com/discordsrv/common/util/function/CheckedFunction.java similarity index 95% rename from common/src/main/java/com/discordsrv/common/function/CheckedFunction.java rename to common/src/main/java/com/discordsrv/common/util/function/CheckedFunction.java index 05d75516..a27c0b68 100644 --- a/common/src/main/java/com/discordsrv/common/function/CheckedFunction.java +++ b/common/src/main/java/com/discordsrv/common/util/function/CheckedFunction.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.function; +package com.discordsrv.common.util.function; @FunctionalInterface public interface CheckedFunction { diff --git a/common/src/main/java/com/discordsrv/common/function/CheckedRunnable.java b/common/src/main/java/com/discordsrv/common/util/function/CheckedRunnable.java similarity index 95% rename from common/src/main/java/com/discordsrv/common/function/CheckedRunnable.java rename to common/src/main/java/com/discordsrv/common/util/function/CheckedRunnable.java index fa39e53b..3252ddde 100644 --- a/common/src/main/java/com/discordsrv/common/function/CheckedRunnable.java +++ b/common/src/main/java/com/discordsrv/common/util/function/CheckedRunnable.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.function; +package com.discordsrv.common.util.function; @FunctionalInterface public interface CheckedRunnable { diff --git a/common/src/main/java/com/discordsrv/common/function/CheckedSupplier.java b/common/src/main/java/com/discordsrv/common/util/function/CheckedSupplier.java similarity index 95% rename from common/src/main/java/com/discordsrv/common/function/CheckedSupplier.java rename to common/src/main/java/com/discordsrv/common/util/function/CheckedSupplier.java index 6e9c83e7..644908ae 100644 --- a/common/src/main/java/com/discordsrv/common/function/CheckedSupplier.java +++ b/common/src/main/java/com/discordsrv/common/util/function/CheckedSupplier.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.discordsrv.common.function; +package com.discordsrv.common.util.function; @FunctionalInterface public interface CheckedSupplier { diff --git a/common/src/test/java/com/discordsrv/common/MockDiscordSRV.java b/common/src/test/java/com/discordsrv/common/MockDiscordSRV.java index 09661dab..a95f9d60 100644 --- a/common/src/test/java/com/discordsrv/common/MockDiscordSRV.java +++ b/common/src/test/java/com/discordsrv/common/MockDiscordSRV.java @@ -19,8 +19,11 @@ package com.discordsrv.common; import com.discordsrv.api.channel.GameChannel; -import com.discordsrv.common.bootstrap.IBootstrap; -import com.discordsrv.common.bootstrap.LifecycleManager; +import com.discordsrv.common.abstraction.bootstrap.IBootstrap; +import com.discordsrv.common.abstraction.bootstrap.LifecycleManager; +import com.discordsrv.common.abstraction.player.IPlayer; +import com.discordsrv.common.abstraction.player.provider.AbstractPlayerProvider; +import com.discordsrv.common.abstraction.plugin.PluginManager; import com.discordsrv.common.command.game.executor.CommandExecutorProvider; import com.discordsrv.common.command.game.handler.ICommandHandler; import com.discordsrv.common.config.configurate.manager.ConnectionConfigManager; @@ -33,19 +36,16 @@ import com.discordsrv.common.config.main.channels.base.ChannelConfig; import com.discordsrv.common.config.main.generic.DestinationConfig; import com.discordsrv.common.config.main.generic.ThreadConfig; import com.discordsrv.common.config.messages.MessagesConfig; -import com.discordsrv.common.console.Console; -import com.discordsrv.common.debug.data.OnlineMode; -import com.discordsrv.common.debug.data.VersionInfo; -import com.discordsrv.common.logging.Logger; -import com.discordsrv.common.logging.backend.LoggingBackend; -import com.discordsrv.common.logging.backend.impl.JavaLoggerImpl; -import com.discordsrv.common.messageforwarding.game.minecrafttodiscord.MinecraftToDiscordChatModule; -import com.discordsrv.common.player.IPlayer; -import com.discordsrv.common.player.provider.AbstractPlayerProvider; -import com.discordsrv.common.plugin.PluginManager; -import com.discordsrv.common.scheduler.Scheduler; -import com.discordsrv.common.scheduler.StandardScheduler; -import com.discordsrv.common.storage.impl.MemoryStorage; +import com.discordsrv.common.core.logging.Logger; +import com.discordsrv.common.core.logging.backend.LoggingBackend; +import com.discordsrv.common.core.logging.backend.impl.JavaLoggerImpl; +import com.discordsrv.common.core.scheduler.Scheduler; +import com.discordsrv.common.core.scheduler.StandardScheduler; +import com.discordsrv.common.core.storage.impl.MemoryStorage; +import com.discordsrv.common.feature.console.Console; +import com.discordsrv.common.feature.debug.data.OnlineMode; +import com.discordsrv.common.feature.debug.data.VersionInfo; +import com.discordsrv.common.feature.messageforwarding.game.minecrafttodiscord.MinecraftToDiscordChatModule; import dev.vankka.dependencydownload.classpath.ClasspathAppender; import net.kyori.adventure.audience.Audience; import org.apache.commons.lang3.StringUtils; diff --git a/common/src/test/java/com/discordsrv/common/event/bus/EventBusTest.java b/common/src/test/java/com/discordsrv/common/event/bus/EventBusTest.java index 7decc8fa..553f3437 100644 --- a/common/src/test/java/com/discordsrv/common/event/bus/EventBusTest.java +++ b/common/src/test/java/com/discordsrv/common/event/bus/EventBusTest.java @@ -18,9 +18,9 @@ package com.discordsrv.common.event.bus; -import com.discordsrv.api.event.bus.EventBus; -import com.discordsrv.api.event.bus.Subscribe; -import com.discordsrv.api.event.events.Event; +import com.discordsrv.api.eventbus.EventBus; +import com.discordsrv.api.eventbus.Subscribe; +import com.discordsrv.api.events.Event; import com.discordsrv.common.MockDiscordSRV; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/common/src/test/java/com/discordsrv/common/linking/requirement/parser/RequirementTypeParserTest.java b/common/src/test/java/com/discordsrv/common/linking/requirement/parser/RequirementTypeParserTest.java index bd653067..d0a78ed4 100644 --- a/common/src/test/java/com/discordsrv/common/linking/requirement/parser/RequirementTypeParserTest.java +++ b/common/src/test/java/com/discordsrv/common/linking/requirement/parser/RequirementTypeParserTest.java @@ -20,13 +20,13 @@ package com.discordsrv.common.linking.requirement.parser; import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.MockDiscordSRV; +import com.discordsrv.common.abstraction.player.IPlayer; import com.discordsrv.common.config.main.linking.RequiredLinkingConfig; -import com.discordsrv.common.linking.requirelinking.RequiredLinkingModule; -import com.discordsrv.common.linking.requirelinking.requirement.RequirementType; -import com.discordsrv.common.linking.requirelinking.requirement.parser.ParsedRequirements; -import com.discordsrv.common.linking.requirelinking.requirement.parser.RequirementParser; -import com.discordsrv.common.player.IPlayer; -import com.discordsrv.common.someone.Someone; +import com.discordsrv.common.feature.linking.requirelinking.RequiredLinkingModule; +import com.discordsrv.common.feature.linking.requirelinking.requirement.RequirementType; +import com.discordsrv.common.feature.linking.requirelinking.requirement.parser.ParsedRequirements; +import com.discordsrv.common.feature.linking.requirelinking.requirement.parser.RequirementParser; +import com.discordsrv.common.helper.Someone; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.function.Executable; diff --git a/common/src/test/java/com/discordsrv/common/messageforwarding/game/MinecraftToDiscordChatMessageTest.java b/common/src/test/java/com/discordsrv/common/messageforwarding/game/MinecraftToDiscordChatMessageTest.java index 58ce9c40..f97906f5 100644 --- a/common/src/test/java/com/discordsrv/common/messageforwarding/game/MinecraftToDiscordChatMessageTest.java +++ b/common/src/test/java/com/discordsrv/common/messageforwarding/game/MinecraftToDiscordChatMessageTest.java @@ -22,18 +22,18 @@ import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel; import com.discordsrv.api.discord.entity.channel.DiscordTextChannel; import com.discordsrv.api.discord.entity.channel.DiscordThreadChannel; import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessage; -import com.discordsrv.api.event.bus.EventBus; -import com.discordsrv.api.event.bus.Subscribe; -import com.discordsrv.api.event.events.message.forward.game.GameChatMessageForwardedEvent; -import com.discordsrv.api.event.events.message.receive.game.GameChatMessageReceiveEvent; +import com.discordsrv.api.eventbus.EventBus; +import com.discordsrv.api.eventbus.Subscribe; +import com.discordsrv.api.events.message.forward.game.GameChatMessageForwardedEvent; +import com.discordsrv.api.events.message.receive.game.GameChatMessageReceiveEvent; import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.FullBootExtension; import com.discordsrv.common.MockDiscordSRV; -import com.discordsrv.common.channel.GlobalChannel; -import com.discordsrv.common.component.util.ComponentUtil; -import com.discordsrv.common.player.IPlayer; -import com.discordsrv.common.player.provider.model.SkinInfo; -import com.discordsrv.common.testing.TestHelper; +import com.discordsrv.common.abstraction.player.IPlayer; +import com.discordsrv.common.abstraction.player.provider.model.SkinInfo; +import com.discordsrv.common.feature.channel.global.GlobalChannel; +import com.discordsrv.common.helper.TestHelper; +import com.discordsrv.common.util.ComponentUtil; import net.kyori.adventure.audience.Audience; import net.kyori.adventure.identity.Identity; import net.kyori.adventure.text.Component; diff --git a/i18n/src/main/java/com/discordsrv/config/DiscordSRVTranslation.java b/i18n/src/main/java/com/discordsrv/config/DiscordSRVTranslation.java index 55933e99..50ca5ca9 100644 --- a/i18n/src/main/java/com/discordsrv/config/DiscordSRVTranslation.java +++ b/i18n/src/main/java/com/discordsrv/config/DiscordSRVTranslation.java @@ -24,7 +24,7 @@ import com.discordsrv.common.config.Config; import com.discordsrv.common.config.configurate.annotation.Untranslated; import com.discordsrv.common.config.configurate.manager.abstraction.ConfigurateConfigManager; import com.discordsrv.common.config.configurate.manager.abstraction.TranslatedConfigManager; -import com.discordsrv.common.logging.backend.impl.JavaLoggerImpl; +import com.discordsrv.common.core.logging.backend.impl.JavaLoggerImpl; import org.spongepowered.configurate.CommentedConfigurationNode; import org.spongepowered.configurate.ConfigurateException; import org.spongepowered.configurate.ConfigurationNode; diff --git a/i18n/src/main/java/com/discordsrv/config/TranslationConfigManagerProxy.java b/i18n/src/main/java/com/discordsrv/config/TranslationConfigManagerProxy.java index a0bf8dec..fba84c73 100644 --- a/i18n/src/main/java/com/discordsrv/config/TranslationConfigManagerProxy.java +++ b/i18n/src/main/java/com/discordsrv/config/TranslationConfigManagerProxy.java @@ -20,7 +20,7 @@ package com.discordsrv.config; import com.discordsrv.common.config.configurate.manager.abstraction.ConfigurateConfigManager; import com.discordsrv.common.config.configurate.manager.loader.YamlConfigLoaderProvider; -import com.discordsrv.common.logging.Logger; +import com.discordsrv.common.core.logging.Logger; import org.spongepowered.configurate.objectmapping.ObjectMapper; import org.spongepowered.configurate.yaml.YamlConfigurationLoader; diff --git a/velocity/src/main/java/com/discordsrv/velocity/DiscordSRVVelocityBootstrap.java b/velocity/src/main/java/com/discordsrv/velocity/DiscordSRVVelocityBootstrap.java index 799d476f..f2f10fac 100644 --- a/velocity/src/main/java/com/discordsrv/velocity/DiscordSRVVelocityBootstrap.java +++ b/velocity/src/main/java/com/discordsrv/velocity/DiscordSRVVelocityBootstrap.java @@ -19,10 +19,10 @@ package com.discordsrv.velocity; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.bootstrap.IBootstrap; -import com.discordsrv.common.bootstrap.LifecycleManager; -import com.discordsrv.common.logging.Logger; -import com.discordsrv.common.logging.backend.impl.SLF4JLoggerImpl; +import com.discordsrv.common.abstraction.bootstrap.IBootstrap; +import com.discordsrv.common.abstraction.bootstrap.LifecycleManager; +import com.discordsrv.common.core.logging.Logger; +import com.discordsrv.common.core.logging.backend.impl.SLF4JLoggerImpl; import com.google.inject.Inject; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.proxy.ProxyInitializeEvent; diff --git a/velocity/src/main/java/com/discordsrv/velocity/VelocityDiscordSRV.java b/velocity/src/main/java/com/discordsrv/velocity/VelocityDiscordSRV.java index 53c0affd..5523852f 100644 --- a/velocity/src/main/java/com/discordsrv/velocity/VelocityDiscordSRV.java +++ b/velocity/src/main/java/com/discordsrv/velocity/VelocityDiscordSRV.java @@ -19,6 +19,7 @@ package com.discordsrv.velocity; import com.discordsrv.common.ProxyDiscordSRV; +import com.discordsrv.common.abstraction.plugin.PluginManager; import com.discordsrv.common.command.game.handler.ICommandHandler; import com.discordsrv.common.config.configurate.manager.ConnectionConfigManager; import com.discordsrv.common.config.configurate.manager.MainConfigManager; @@ -26,9 +27,8 @@ import com.discordsrv.common.config.configurate.manager.MessagesConfigManager; import com.discordsrv.common.config.connection.ConnectionConfig; import com.discordsrv.common.config.main.MainConfig; import com.discordsrv.common.config.messages.MessagesConfig; -import com.discordsrv.common.debug.data.OnlineMode; -import com.discordsrv.common.plugin.PluginManager; -import com.discordsrv.common.scheduler.StandardScheduler; +import com.discordsrv.common.core.scheduler.StandardScheduler; +import com.discordsrv.common.feature.debug.data.OnlineMode; import com.discordsrv.velocity.command.game.handler.VelocityCommandHandler; import com.discordsrv.velocity.console.VelocityConsole; import com.discordsrv.velocity.player.VelocityPlayerProvider; diff --git a/velocity/src/main/java/com/discordsrv/velocity/console/VelocityConsole.java b/velocity/src/main/java/com/discordsrv/velocity/console/VelocityConsole.java index 784d85e5..f7385b74 100644 --- a/velocity/src/main/java/com/discordsrv/velocity/console/VelocityConsole.java +++ b/velocity/src/main/java/com/discordsrv/velocity/console/VelocityConsole.java @@ -19,9 +19,9 @@ package com.discordsrv.velocity.console; import com.discordsrv.common.command.game.executor.CommandExecutorProvider; -import com.discordsrv.common.console.Console; -import com.discordsrv.common.logging.backend.LoggingBackend; -import com.discordsrv.common.logging.backend.impl.Log4JLoggerImpl; +import com.discordsrv.common.core.logging.backend.LoggingBackend; +import com.discordsrv.common.core.logging.backend.impl.Log4JLoggerImpl; +import com.discordsrv.common.feature.console.Console; import com.discordsrv.velocity.VelocityDiscordSRV; import com.discordsrv.velocity.command.game.sender.VelocityCommandSender; import com.discordsrv.velocity.console.executor.VelocityCommandExecutorProvider; diff --git a/velocity/src/main/java/com/discordsrv/velocity/player/VelocityPlayer.java b/velocity/src/main/java/com/discordsrv/velocity/player/VelocityPlayer.java index 9325f928..92680763 100644 --- a/velocity/src/main/java/com/discordsrv/velocity/player/VelocityPlayer.java +++ b/velocity/src/main/java/com/discordsrv/velocity/player/VelocityPlayer.java @@ -19,9 +19,9 @@ package com.discordsrv.velocity.player; import com.discordsrv.common.DiscordSRV; -import com.discordsrv.common.player.IPlayer; -import com.discordsrv.common.player.provider.model.SkinInfo; -import com.discordsrv.common.player.provider.model.Textures; +import com.discordsrv.common.abstraction.player.IPlayer; +import com.discordsrv.common.abstraction.player.provider.model.SkinInfo; +import com.discordsrv.common.abstraction.player.provider.model.Textures; import com.discordsrv.velocity.VelocityDiscordSRV; import com.discordsrv.velocity.command.game.sender.VelocityCommandSender; import com.velocitypowered.api.proxy.Player; diff --git a/velocity/src/main/java/com/discordsrv/velocity/player/VelocityPlayerProvider.java b/velocity/src/main/java/com/discordsrv/velocity/player/VelocityPlayerProvider.java index 435fdab3..a1437d63 100644 --- a/velocity/src/main/java/com/discordsrv/velocity/player/VelocityPlayerProvider.java +++ b/velocity/src/main/java/com/discordsrv/velocity/player/VelocityPlayerProvider.java @@ -18,7 +18,7 @@ package com.discordsrv.velocity.player; -import com.discordsrv.common.player.provider.AbstractPlayerProvider; +import com.discordsrv.common.abstraction.player.provider.AbstractPlayerProvider; import com.discordsrv.velocity.VelocityDiscordSRV; import com.velocitypowered.api.event.PostOrder; import com.velocitypowered.api.event.Subscribe; diff --git a/velocity/src/main/java/com/discordsrv/velocity/plugin/VelocityPluginManager.java b/velocity/src/main/java/com/discordsrv/velocity/plugin/VelocityPluginManager.java index 1e4ee221..60232d2c 100644 --- a/velocity/src/main/java/com/discordsrv/velocity/plugin/VelocityPluginManager.java +++ b/velocity/src/main/java/com/discordsrv/velocity/plugin/VelocityPluginManager.java @@ -18,8 +18,8 @@ package com.discordsrv.velocity.plugin; -import com.discordsrv.common.plugin.Plugin; -import com.discordsrv.common.plugin.PluginManager; +import com.discordsrv.common.abstraction.plugin.Plugin; +import com.discordsrv.common.abstraction.plugin.PluginManager; import com.discordsrv.velocity.VelocityDiscordSRV; import com.velocitypowered.api.plugin.PluginDescription;