Reorganize packages

This commit is contained in:
Vankka 2024-07-27 13:58:35 +03:00
parent 8077555bd7
commit cc0683ab30
No known key found for this signature in database
GPG Key ID: 62E48025ED4E7EBB
332 changed files with 1055 additions and 1035 deletions

View File

@ -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;

View File

@ -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;

View File

@ -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<OptionData> {
}
/**
* 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) {

View File

@ -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<CommandData> {
* @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<CommandData> {
* @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<DiscordUserContextInteractionEvent> user(
ComponentIdentifier id,
@ -86,7 +86,7 @@ public class DiscordCommand implements JDAEntity<CommandData> {
* @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<DiscordMessageContextInteractionEvent> message(
ComponentIdentifier id,

View File

@ -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 {

View File

@ -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<net.dv8tion.jda.api.interactions.modals.Modal> {

View File

@ -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 {

View File

@ -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;

View File

@ -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;

View File

@ -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();

View File

@ -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,

View File

@ -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;

View File

@ -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;

View File

@ -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

View File

@ -21,7 +21,7 @@
* SOFTWARE.
*/
package com.discordsrv.api.event.events;
package com.discordsrv.api.events;
/**
* A DiscordSRV event.

View File

@ -21,7 +21,7 @@
* SOFTWARE.
*/
package com.discordsrv.api.event.events;
package com.discordsrv.api.events;
import com.discordsrv.api.player.DiscordSRVPlayer;

View File

@ -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

View File

@ -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()
*/

View File

@ -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;

View File

@ -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<T extends GenericEvent> extends Event, JDAEntity<T> {

View File

@ -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;

View File

@ -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<T extends GenericInteractionCreateEvent> extends AbstractDiscordEvent<T> {
public abstract class AbstractInteractionEvent<T extends GenericInteractionCreateEvent> extends
AbstractDiscordEvent<T> {
protected final ComponentIdentifier identifier;
protected final DiscordUser user;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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<ButtonInteractionEvent> {

View File

@ -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<GenericSelectMenuInteractionEvent<?, ?>> {

View File

@ -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<T extends GenericGuildMemberEvent> extends AbstractDiscordEvent<T> {

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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.

View File

@ -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.

View File

@ -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;

View File

@ -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.

View File

@ -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;

View File

@ -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;

View File

@ -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;
/**

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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,

View File

@ -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;
/**

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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;

View File

@ -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

View File

@ -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 {

View File

@ -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 {

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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 {

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

Some files were not shown because too many files have changed in this diff Show More