Upstream/Ascension
1
0
Fork 0
mirror of https://github.com/DiscordSRV/Ascension.git synced 2024-11-21 11:45:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

com.discordsrv.api.discord.api -> com.discordsrv.api.discord

Browse Source 
com.discordsrv.api.discord.connection -> com.discordsrv.api.discord.connection.jda
This commit is contained in:
Vankka 2022-05-12 17:59:46 +03:00
parent 6a81b21e54
commit 984331a458
No known key found for this signature in database
GPG Key ID: 6E50CB7A29B96AD0
89 changed files with 212 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/main/java/com/discordsrv/api/DiscordSRVApi.java
View File

@ -24,8 +24,8 @@
package com.discordsrv.api;
import com.discordsrv.api.component.MinecraftComponentFactory;
import com.discordsrv.api.discord.api.DiscordAPI;
import com.discordsrv.api.discord.connection.DiscordConnectionDetails;
import com.discordsrv.api.discord.DiscordAPI;
import com.discordsrv.api.discord.connection.jda.DiscordConnectionDetails;
import com.discordsrv.api.event.bus.EventBus;
import com.discordsrv.api.placeholder.PlaceholderService;
import com.discordsrv.api.player.DiscordSRVPlayer;

2
api/src/main/java/com/discordsrv/api/component/EnhancedTextBuilder.java
View File

@ -31,7 +31,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* Minecraft equivalent for {@link com.discordsrv.api.discord.api.entity.message.SendableDiscordMessage.Formatter}.
* Minecraft equivalent for {@link com.discordsrv.api.discord.entity.message.SendableDiscordMessage.Formatter}.
*/
public interface EnhancedTextBuilder {

16
api/src/main/java/com/discordsrv/api/discord/api/DiscordAPI.java → api/src/main/java/com/discordsrv/api/discord/DiscordAPI.java
View File

@ -21,15 +21,15 @@
* SOFTWARE.
*/
package com.discordsrv.api.discord.api;
package com.discordsrv.api.discord;
import com.discordsrv.api.discord.api.entity.DiscordUser;
import com.discordsrv.api.discord.api.entity.channel.DiscordDMChannel;
import com.discordsrv.api.discord.api.entity.channel.DiscordMessageChannel;
import com.discordsrv.api.discord.api.entity.channel.DiscordTextChannel;
import com.discordsrv.api.discord.api.entity.channel.DiscordThreadChannel;
import com.discordsrv.api.discord.api.entity.guild.DiscordGuild;
import com.discordsrv.api.discord.api.entity.guild.DiscordRole;
import com.discordsrv.api.discord.entity.DiscordUser;
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.discord.entity.guild.DiscordGuild;
import com.discordsrv.api.discord.entity.guild.DiscordRole;
import org.jetbrains.annotations.NotNull;
import java.util.Optional;

2
api/src/main/java/com/discordsrv/api/discord/connection/DiscordConnectionDetails.java → api/src/main/java/com/discordsrv/api/discord/connection/jda/DiscordConnectionDetails.java
View File

@ -21,7 +21,7 @@
* SOFTWARE.
*/
package com.discordsrv.api.discord.connection;
package com.discordsrv.api.discord.connection.jda;
import com.discordsrv.api.DiscordSRVApi;
import net.dv8tion.jda.api.requests.GatewayIntent;

4
api/src/main/java/com/discordsrv/api/discord/api/entity/DiscordUser.java → api/src/main/java/com/discordsrv/api/discord/entity/DiscordUser.java
View File

@ -21,10 +21,10 @@
* SOFTWARE.
*/
package com.discordsrv.api.discord.api.entity;
package com.discordsrv.api.discord.entity;
import com.discordsrv.api.DiscordSRVApi;
import com.discordsrv.api.discord.api.entity.channel.DiscordDMChannel;
import com.discordsrv.api.discord.entity.channel.DiscordDMChannel;
import com.discordsrv.api.placeholder.annotation.Placeholder;
import net.dv8tion.jda.api.entities.User;
import org.jetbrains.annotations.NotNull;

2
api/src/main/java/com/discordsrv/api/discord/api/entity/Mentionable.java → api/src/main/java/com/discordsrv/api/discord/entity/Mentionable.java
View File

@ -21,7 +21,7 @@
* SOFTWARE.
*/
package com.discordsrv.api.discord.api.entity;
package com.discordsrv.api.discord.entity;
public interface Mentionable {

2
api/src/main/java/com/discordsrv/api/discord/api/entity/Snowflake.java → api/src/main/java/com/discordsrv/api/discord/entity/Snowflake.java
View File

@ -21,7 +21,7 @@
* SOFTWARE.
*/
package com.discordsrv.api.discord.api.entity;
package com.discordsrv.api.discord.entity;
/**
* A snowflake identifier.

4
api/src/main/java/com/discordsrv/api/discord/api/entity/channel/DiscordDMChannel.java → api/src/main/java/com/discordsrv/api/discord/entity/channel/DiscordDMChannel.java
View File

@ -21,10 +21,10 @@
* SOFTWARE.
*/
package com.discordsrv.api.discord.api.entity.channel;
package com.discordsrv.api.discord.entity.channel;
import com.discordsrv.api.DiscordSRVApi;
import com.discordsrv.api.discord.api.entity.DiscordUser;
import com.discordsrv.api.discord.entity.DiscordUser;
import net.dv8tion.jda.api.entities.PrivateChannel;
import org.jetbrains.annotations.Nullable;

4
api/src/main/java/com/discordsrv/api/discord/api/entity/channel/DiscordGuildChannel.java → api/src/main/java/com/discordsrv/api/discord/entity/channel/DiscordGuildChannel.java
View File

@ -21,9 +21,9 @@
* SOFTWARE.
*/
package com.discordsrv.api.discord.api.entity.channel;
package com.discordsrv.api.discord.entity.channel;
import com.discordsrv.api.discord.api.entity.guild.DiscordGuild;
import com.discordsrv.api.discord.entity.guild.DiscordGuild;
import org.jetbrains.annotations.NotNull;
public interface DiscordGuildChannel {

4
api/src/main/java/com/discordsrv/api/discord/api/entity/channel/DiscordGuildMessageChannel.java → api/src/main/java/com/discordsrv/api/discord/entity/channel/DiscordGuildMessageChannel.java
View File

@ -21,9 +21,9 @@
* SOFTWARE.
*/
package com.discordsrv.api.discord.api.entity.channel;
package com.discordsrv.api.discord.entity.channel;
import com.discordsrv.api.discord.api.entity.Mentionable;
import com.discordsrv.api.discord.entity.Mentionable;
/**
* A regular Discord channel that messages can be sent to.

8
api/src/main/java/com/discordsrv/api/discord/api/entity/channel/DiscordMessageChannel.java → api/src/main/java/com/discordsrv/api/discord/entity/channel/DiscordMessageChannel.java
View File

@ -21,12 +21,12 @@
* SOFTWARE.
*/
package com.discordsrv.api.discord.api.entity.channel;
package com.discordsrv.api.discord.entity.channel;
import com.discordsrv.api.DiscordSRVApi;
import com.discordsrv.api.discord.api.entity.Snowflake;
import com.discordsrv.api.discord.api.entity.message.ReceivedDiscordMessage;
import com.discordsrv.api.discord.api.entity.message.SendableDiscordMessage;
import com.discordsrv.api.discord.entity.Snowflake;
import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessage;
import com.discordsrv.api.discord.entity.message.SendableDiscordMessage;
import net.dv8tion.jda.api.entities.MessageChannel;
import org.jetbrains.annotations.NotNull;

2
api/src/main/java/com/discordsrv/api/discord/api/entity/channel/DiscordNewsChannel.java → api/src/main/java/com/discordsrv/api/discord/entity/channel/DiscordNewsChannel.java
View File

@ -21,7 +21,7 @@
* SOFTWARE.
*/
package com.discordsrv.api.discord.api.entity.channel;
package com.discordsrv.api.discord.entity.channel;
import com.discordsrv.api.DiscordSRVApi;
import net.dv8tion.jda.api.entities.NewsChannel;

2
api/src/main/java/com/discordsrv/api/discord/api/entity/channel/DiscordTextChannel.java → api/src/main/java/com/discordsrv/api/discord/entity/channel/DiscordTextChannel.java
View File

@ -21,7 +21,7 @@
* SOFTWARE.
*/
package com.discordsrv.api.discord.api.entity.channel;
package com.discordsrv.api.discord.entity.channel;
import com.discordsrv.api.DiscordSRVApi;
import net.dv8tion.jda.api.entities.TextChannel;

2
api/src/main/java/com/discordsrv/api/discord/api/entity/channel/DiscordThreadChannel.java → api/src/main/java/com/discordsrv/api/discord/entity/channel/DiscordThreadChannel.java
View File

@ -21,7 +21,7 @@
* SOFTWARE.
*/
package com.discordsrv.api.discord.api.entity.channel;
package com.discordsrv.api.discord.entity.channel;
import com.discordsrv.api.DiscordSRVApi;
import net.dv8tion.jda.api.entities.ThreadChannel;

2
api/src/main/java/com/discordsrv/api/discord/api/entity/channel/DiscordThreadContainer.java → api/src/main/java/com/discordsrv/api/discord/entity/channel/DiscordThreadContainer.java
View File

@ -21,7 +21,7 @@
* SOFTWARE.
*/
package com.discordsrv.api.discord.api.entity.channel;
package com.discordsrv.api.discord.entity.channel;
import org.jetbrains.annotations.NotNull;

4
api/src/main/java/com/discordsrv/api/discord/api/entity/guild/DiscordGuild.java → api/src/main/java/com/discordsrv/api/discord/entity/guild/DiscordGuild.java
View File

@ -21,10 +21,10 @@
* SOFTWARE.
*/
package com.discordsrv.api.discord.api.entity.guild;
package com.discordsrv.api.discord.entity.guild;
import com.discordsrv.api.DiscordSRVApi;
import com.discordsrv.api.discord.api.entity.Snowflake;
import com.discordsrv.api.discord.entity.Snowflake;
import com.discordsrv.api.placeholder.annotation.Placeholder;
import net.dv8tion.jda.api.entities.Guild;
import org.jetbrains.annotations.NotNull;

6
api/src/main/java/com/discordsrv/api/discord/api/entity/guild/DiscordGuildMember.java → api/src/main/java/com/discordsrv/api/discord/entity/guild/DiscordGuildMember.java
View File

@ -21,12 +21,12 @@
* SOFTWARE.
*/
package com.discordsrv.api.discord.api.entity.guild;
package com.discordsrv.api.discord.entity.guild;
import com.discordsrv.api.DiscordSRVApi;
import com.discordsrv.api.color.Color;
import com.discordsrv.api.discord.api.entity.DiscordUser;
import com.discordsrv.api.discord.api.entity.Mentionable;
import com.discordsrv.api.discord.entity.DiscordUser;
import com.discordsrv.api.discord.entity.Mentionable;
import com.discordsrv.api.placeholder.annotation.Placeholder;
import net.dv8tion.jda.api.entities.Member;
import org.jetbrains.annotations.NotNull;

6
api/src/main/java/com/discordsrv/api/discord/api/entity/guild/DiscordRole.java → api/src/main/java/com/discordsrv/api/discord/entity/guild/DiscordRole.java
View File

@ -21,12 +21,12 @@
* SOFTWARE.
*/
package com.discordsrv.api.discord.api.entity.guild;
package com.discordsrv.api.discord.entity.guild;
import com.discordsrv.api.DiscordSRVApi;
import com.discordsrv.api.color.Color;
import com.discordsrv.api.discord.api.entity.Mentionable;
import com.discordsrv.api.discord.api.entity.Snowflake;
import com.discordsrv.api.discord.entity.Mentionable;
import com.discordsrv.api.discord.entity.Snowflake;
import com.discordsrv.api.placeholder.annotation.Placeholder;
import net.dv8tion.jda.api.entities.Role;
import org.jetbrains.annotations.NotNull;

4
api/src/main/java/com/discordsrv/api/discord/api/entity/message/AllowedMention.java → api/src/main/java/com/discordsrv/api/discord/entity/message/AllowedMention.java
View File

@ -21,12 +21,12 @@
* SOFTWARE.
*/
package com.discordsrv.api.discord.api.entity.message;
package com.discordsrv.api.discord.entity.message;
import net.dv8tion.jda.api.entities.Message;
/**
* An allowed mention that can be used with {@link com.discordsrv.api.discord.api.entity.message.SendableDiscordMessage.Builder#addAllowedMention(AllowedMention)}.
* An allowed mention that can be used with {@link com.discordsrv.api.discord.entity.message.SendableDiscordMessage.Builder#addAllowedMention(AllowedMention)}.
*/
@SuppressWarnings("unused") // API
public interface AllowedMention {

2
api/src/main/java/com/discordsrv/api/discord/api/entity/message/DiscordMessageEmbed.java → api/src/main/java/com/discordsrv/api/discord/entity/message/DiscordMessageEmbed.java
View File

@ -21,7 +21,7 @@
* SOFTWARE.
*/
package com.discordsrv.api.discord.api.entity.message;
package com.discordsrv.api.discord.entity.message;
import com.discordsrv.api.color.Color;
import net.dv8tion.jda.api.EmbedBuilder;

16
api/src/main/java/com/discordsrv/api/discord/api/entity/message/ReceivedDiscordMessage.java → api/src/main/java/com/discordsrv/api/discord/entity/message/ReceivedDiscordMessage.java
View File

@ -21,15 +21,15 @@
* SOFTWARE.
*/
package com.discordsrv.api.discord.api.entity.message;
package com.discordsrv.api.discord.entity.message;
import com.discordsrv.api.discord.api.entity.DiscordUser;
import com.discordsrv.api.discord.api.entity.Snowflake;
import com.discordsrv.api.discord.api.entity.channel.DiscordDMChannel;
import com.discordsrv.api.discord.api.entity.channel.DiscordMessageChannel;
import com.discordsrv.api.discord.api.entity.channel.DiscordTextChannel;
import com.discordsrv.api.discord.api.entity.guild.DiscordGuild;
import com.discordsrv.api.discord.api.entity.guild.DiscordGuildMember;
import com.discordsrv.api.discord.entity.DiscordUser;
import com.discordsrv.api.discord.entity.Snowflake;
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.guild.DiscordGuild;
import com.discordsrv.api.discord.entity.guild.DiscordGuildMember;
import org.jetbrains.annotations.NotNull;
import java.util.List;

2
api/src/main/java/com/discordsrv/api/discord/api/entity/message/ReceivedDiscordMessageCluster.java → api/src/main/java/com/discordsrv/api/discord/entity/message/ReceivedDiscordMessageCluster.java
View File

@ -21,7 +21,7 @@
* SOFTWARE.
*/
package com.discordsrv.api.discord.api.entity.message;
package com.discordsrv.api.discord.entity.message;
import org.jetbrains.annotations.NotNull;

4
api/src/main/java/com/discordsrv/api/discord/api/entity/message/SendableDiscordMessage.java → api/src/main/java/com/discordsrv/api/discord/entity/message/SendableDiscordMessage.java
View File

@ -21,9 +21,9 @@
* SOFTWARE.
*/
package com.discordsrv.api.discord.api.entity.message;
package com.discordsrv.api.discord.entity.message;
import com.discordsrv.api.discord.api.entity.message.impl.SendableDiscordMessageImpl;
import com.discordsrv.api.discord.entity.message.impl.SendableDiscordMessageImpl;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

10
api/src/main/java/com/discordsrv/api/discord/api/entity/message/impl/SendableDiscordMessageImpl.java → api/src/main/java/com/discordsrv/api/discord/entity/message/impl/SendableDiscordMessageImpl.java
View File

@ -21,13 +21,13 @@
* SOFTWARE.
*/
package com.discordsrv.api.discord.api.entity.message.impl;
package com.discordsrv.api.discord.entity.message.impl;
import com.discordsrv.api.DiscordSRVApi;
import com.discordsrv.api.discord.api.entity.message.AllowedMention;
import com.discordsrv.api.discord.api.entity.message.DiscordMessageEmbed;
import com.discordsrv.api.discord.api.entity.message.SendableDiscordMessage;
import com.discordsrv.api.discord.api.util.DiscordFormattingUtil;
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.FormattedText;
import com.discordsrv.api.placeholder.PlaceholderService;
import com.discordsrv.api.placeholder.mapper.ResultMappers;

2
api/src/main/java/com/discordsrv/api/discord/events/member/AbstractDiscordMemberEvent.java
View File

@ -23,7 +23,7 @@
package com.discordsrv.api.discord.events.member;
import com.discordsrv.api.discord.api.entity.guild.DiscordGuildMember;
import com.discordsrv.api.discord.entity.guild.DiscordGuildMember;
import com.discordsrv.api.discord.events.DiscordEvent;
public abstract class AbstractDiscordMemberEvent implements DiscordEvent {

4
api/src/main/java/com/discordsrv/api/discord/events/member/role/AbstractDiscordMemberRoleChangeEvent.java
View File

@ -23,8 +23,8 @@
package com.discordsrv.api.discord.events.member.role;
import com.discordsrv.api.discord.api.entity.guild.DiscordGuildMember;
import com.discordsrv.api.discord.api.entity.guild.DiscordRole;
import com.discordsrv.api.discord.entity.guild.DiscordGuildMember;
import com.discordsrv.api.discord.entity.guild.DiscordRole;
import com.discordsrv.api.discord.events.member.AbstractDiscordMemberEvent;
import java.util.List;

4
api/src/main/java/com/discordsrv/api/discord/events/member/role/DiscordMemberRoleAddEvent.java
View File

@ -23,8 +23,8 @@
package com.discordsrv.api.discord.events.member.role;
import com.discordsrv.api.discord.api.entity.guild.DiscordGuildMember;
import com.discordsrv.api.discord.api.entity.guild.DiscordRole;
import com.discordsrv.api.discord.entity.guild.DiscordGuildMember;
import com.discordsrv.api.discord.entity.guild.DiscordRole;
import java.util.List;

4
api/src/main/java/com/discordsrv/api/discord/events/member/role/DiscordMemberRoleRemoveEvent.java
View File

@ -23,8 +23,8 @@
package com.discordsrv.api.discord.events.member.role;
import com.discordsrv.api.discord.api.entity.guild.DiscordGuildMember;
import com.discordsrv.api.discord.api.entity.guild.DiscordRole;
import com.discordsrv.api.discord.entity.guild.DiscordGuildMember;
import com.discordsrv.api.discord.entity.guild.DiscordRole;
import java.util.List;

8
api/src/main/java/com/discordsrv/api/discord/events/message/AbstractDiscordMessageEvent.java
View File

@ -23,10 +23,10 @@
package com.discordsrv.api.discord.events.message;
import com.discordsrv.api.discord.api.entity.channel.DiscordDMChannel;
import com.discordsrv.api.discord.api.entity.channel.DiscordMessageChannel;
import com.discordsrv.api.discord.api.entity.channel.DiscordTextChannel;
import com.discordsrv.api.discord.api.entity.channel.DiscordThreadChannel;
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.discord.events.DiscordEvent;
import org.jetbrains.annotations.NotNull;

2
api/src/main/java/com/discordsrv/api/discord/events/message/DiscordMessageDeleteEvent.java
View File

@ -23,7 +23,7 @@
package com.discordsrv.api.discord.events.message;
import com.discordsrv.api.discord.api.entity.channel.DiscordMessageChannel;
import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel;
public class DiscordMessageDeleteEvent extends AbstractDiscordMessageEvent {

4
api/src/main/java/com/discordsrv/api/discord/events/message/DiscordMessageReceiveEvent.java
View File

@ -23,8 +23,8 @@
package com.discordsrv.api.discord.events.message;
import com.discordsrv.api.discord.api.entity.channel.DiscordMessageChannel;
import com.discordsrv.api.discord.api.entity.message.ReceivedDiscordMessage;
import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel;
import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessage;
public class DiscordMessageReceiveEvent extends AbstractDiscordMessageEvent {

4
api/src/main/java/com/discordsrv/api/discord/events/message/DiscordMessageUpdateEvent.java
View File

@ -23,8 +23,8 @@
package com.discordsrv.api.discord.events.message;
import com.discordsrv.api.discord.api.entity.channel.DiscordMessageChannel;
import com.discordsrv.api.discord.api.entity.message.ReceivedDiscordMessage;
import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel;
import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessage;
public class DiscordMessageUpdateEvent extends AbstractDiscordMessageEvent {

2
api/src/main/java/com/discordsrv/api/discord/api/exception/EntityNoLongerAvailableException.java → api/src/main/java/com/discordsrv/api/discord/exception/EntityNoLongerAvailableException.java
View File

@ -21,6 +21,6 @@
* SOFTWARE.
*/
package com.discordsrv.api.discord.api.exception;
package com.discordsrv.api.discord.exception;
public class EntityNoLongerAvailableException extends Exception {}

2
api/src/main/java/com/discordsrv/api/discord/api/exception/NotReadyException.java → api/src/main/java/com/discordsrv/api/discord/exception/NotReadyException.java
View File

@ -21,6 +21,6 @@
* SOFTWARE.
*/
package com.discordsrv.api.discord.api.exception;
package com.discordsrv.api.discord.exception;
public class NotReadyException extends RuntimeException {}

2
api/src/main/java/com/discordsrv/api/discord/api/exception/RestErrorResponseException.java → api/src/main/java/com/discordsrv/api/discord/exception/RestErrorResponseException.java
View File

@ -21,7 +21,7 @@
* SOFTWARE.
*/
package com.discordsrv.api.discord.api.exception;
package com.discordsrv.api.discord.exception;
import net.dv8tion.jda.api.requests.ErrorResponse;

2
api/src/main/java/com/discordsrv/api/discord/api/util/DiscordFormattingUtil.java → api/src/main/java/com/discordsrv/api/discord/util/DiscordFormattingUtil.java
View File

@ -21,7 +21,7 @@
* SOFTWARE.
*/
package com.discordsrv.api.discord.api.util;
package com.discordsrv.api.discord.util;
import java.util.regex.Matcher;

2
api/src/main/java/com/discordsrv/api/event/events/message/forward/game/AbstractGameMessageForwardedEvent.java
View File

@ -23,7 +23,7 @@
package com.discordsrv.api.event.events.message.forward.game;
import com.discordsrv.api.discord.api.entity.message.ReceivedDiscordMessageCluster;
import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster;
import com.discordsrv.api.event.events.Event;
import org.jetbrains.annotations.NotNull;

2
api/src/main/java/com/discordsrv/api/event/events/message/forward/game/DeathMessageForwardedEvent.java
View File

@ -23,7 +23,7 @@
package com.discordsrv.api.event.events.message.forward.game;
import com.discordsrv.api.discord.api.entity.message.ReceivedDiscordMessageCluster;
import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster;
import org.jetbrains.annotations.NotNull;
public class DeathMessageForwardedEvent extends AbstractGameMessageForwardedEvent {

2
api/src/main/java/com/discordsrv/api/event/events/message/forward/game/GameChatMessageForwardedEvent.java
View File

@ -23,7 +23,7 @@
package com.discordsrv.api.event.events.message.forward.game;
import com.discordsrv.api.discord.api.entity.message.ReceivedDiscordMessageCluster;
import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster;
import org.jetbrains.annotations.NotNull;
public class GameChatMessageForwardedEvent extends AbstractGameMessageForwardedEvent {

2
api/src/main/java/com/discordsrv/api/event/events/message/forward/game/JoinMessageForwardedEvent.java
View File

@ -23,7 +23,7 @@
package com.discordsrv.api.event.events.message.forward.game;
import com.discordsrv.api.discord.api.entity.message.ReceivedDiscordMessageCluster;
import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster;
import org.jetbrains.annotations.NotNull;
public class JoinMessageForwardedEvent extends AbstractGameMessageForwardedEvent {

2
api/src/main/java/com/discordsrv/api/event/events/message/forward/game/LeaveMessageForwardedEvent.java
View File

@ -23,7 +23,7 @@
package com.discordsrv.api.event.events.message.forward.game;
import com.discordsrv.api.discord.api.entity.message.ReceivedDiscordMessageCluster;
import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster;
import org.jetbrains.annotations.NotNull;
public class LeaveMessageForwardedEvent extends AbstractGameMessageForwardedEvent {

2
api/src/main/java/com/discordsrv/api/event/events/message/forward/game/ServerSwitchMessageForwardedEvent.java
View File

@ -23,7 +23,7 @@
package com.discordsrv.api.event.events.message.forward.game;
import com.discordsrv.api.discord.api.entity.message.ReceivedDiscordMessageCluster;
import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster;
import org.jetbrains.annotations.NotNull;
public class ServerSwitchMessageForwardedEvent extends AbstractGameMessageForwardedEvent {

10
api/src/main/java/com/discordsrv/api/event/events/message/receive/discord/DiscordChatMessageProcessingEvent.java
View File

@ -23,11 +23,11 @@
package com.discordsrv.api.event.events.message.receive.discord;
import com.discordsrv.api.discord.api.entity.channel.DiscordMessageChannel;
import com.discordsrv.api.discord.api.entity.channel.DiscordTextChannel;
import com.discordsrv.api.discord.api.entity.channel.DiscordThreadChannel;
import com.discordsrv.api.discord.api.entity.guild.DiscordGuild;
import com.discordsrv.api.discord.api.entity.message.ReceivedDiscordMessage;
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.Processable;
import org.jetbrains.annotations.NotNull;

4
common/proxy/src/main/java/com/discordsrv/proxy/config/channels/ServerSwitchMessageConfig.java
View File

@ -18,8 +18,8 @@
package com.discordsrv.proxy.config.channels;
import com.discordsrv.api.discord.api.entity.message.DiscordMessageEmbed;
import com.discordsrv.api.discord.api.entity.message.SendableDiscordMessage;
import com.discordsrv.api.discord.entity.message.DiscordMessageEmbed;
import com.discordsrv.api.discord.entity.message.SendableDiscordMessage;
import com.discordsrv.common.config.annotation.Untranslated;
import com.discordsrv.common.config.main.channels.IMessageConfig;
import org.spongepowered.configurate.objectmapping.ConfigSerializable;

2
common/proxy/src/main/java/com/discordsrv/proxy/modules/ServerSwitchMessageModule.java
View File

@ -18,7 +18,7 @@
package com.discordsrv.proxy.modules;
import com.discordsrv.api.discord.api.entity.message.ReceivedDiscordMessageCluster;
import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster;
import com.discordsrv.api.event.bus.EventPriority;
import com.discordsrv.api.event.bus.Subscribe;
import com.discordsrv.api.event.events.message.forward.game.ServerSwitchMessageForwardedEvent;

4
common/server/src/main/java/com/discordsrv/common/server/config/channels/DeathMessageConfig.java
View File

@ -18,8 +18,8 @@
package com.discordsrv.common.server.config.channels;
import com.discordsrv.api.discord.api.entity.message.DiscordMessageEmbed;
import com.discordsrv.api.discord.api.entity.message.SendableDiscordMessage;
import com.discordsrv.api.discord.entity.message.DiscordMessageEmbed;
import com.discordsrv.api.discord.entity.message.SendableDiscordMessage;
import com.discordsrv.common.config.annotation.Untranslated;
import com.discordsrv.common.config.main.channels.IMessageConfig;
import org.spongepowered.configurate.objectmapping.ConfigSerializable;

2
common/server/src/main/java/com/discordsrv/common/server/modules/DeathMessageModule.java
View File

@ -18,7 +18,7 @@
package com.discordsrv.common.server.modules;
import com.discordsrv.api.discord.api.entity.message.ReceivedDiscordMessageCluster;
import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster;
import com.discordsrv.api.event.bus.EventPriority;
import com.discordsrv.api.event.bus.Subscribe;
import com.discordsrv.api.event.events.message.forward.game.DeathMessageForwardedEvent;

2
common/src/main/java/com/discordsrv/common/AbstractDiscordSRV.java
View File

@ -18,7 +18,7 @@
package com.discordsrv.common;
import com.discordsrv.api.discord.connection.DiscordConnectionDetails;
import com.discordsrv.api.discord.connection.jda.DiscordConnectionDetails;
import com.discordsrv.api.event.events.lifecycle.DiscordSRVConnectedEvent;
import com.discordsrv.api.event.events.lifecycle.DiscordSRVReadyEvent;
import com.discordsrv.api.event.events.lifecycle.DiscordSRVReloadedEvent;

6
common/src/main/java/com/discordsrv/common/channel/ChannelConfigHelper.java
View File

@ -19,9 +19,9 @@
package com.discordsrv.common.channel;
import com.discordsrv.api.channel.GameChannel;
import com.discordsrv.api.discord.api.entity.channel.DiscordMessageChannel;
import com.discordsrv.api.discord.api.entity.channel.DiscordTextChannel;
import com.discordsrv.api.discord.api.entity.channel.DiscordThreadChannel;
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.common.DiscordSRV;
import com.discordsrv.common.config.main.channels.base.BaseChannelConfig;

2
common/src/main/java/com/discordsrv/common/channel/ChannelLockingModule.java
View File

@ -18,7 +18,7 @@
package com.discordsrv.common.channel;
import com.discordsrv.api.discord.api.entity.channel.DiscordThreadChannel;
import com.discordsrv.api.discord.entity.channel.DiscordThreadChannel;
import com.discordsrv.common.DiscordSRV;
import com.discordsrv.common.config.main.channels.ChannelLockingConfig;
import com.discordsrv.common.config.main.channels.base.BaseChannelConfig;

6
common/src/main/java/com/discordsrv/common/command/game/command/subcommand/BroadcastCommand.java
View File

@ -19,9 +19,9 @@
package com.discordsrv.common.command.game.command.subcommand;
import com.discordsrv.api.component.MinecraftComponent;
import com.discordsrv.api.discord.api.entity.channel.DiscordMessageChannel;
import com.discordsrv.api.discord.api.entity.channel.DiscordThreadChannel;
import com.discordsrv.api.discord.api.entity.message.SendableDiscordMessage;
import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel;
import com.discordsrv.api.discord.entity.channel.DiscordThreadChannel;
import com.discordsrv.api.discord.entity.message.SendableDiscordMessage;
import com.discordsrv.common.DiscordSRV;
import com.discordsrv.common.command.game.abstraction.GameCommand;
import com.discordsrv.common.command.game.abstraction.GameCommandArguments;

8
common/src/main/java/com/discordsrv/common/component/renderer/DiscordSRVMinecraftRenderer.java
View File

@ -19,10 +19,10 @@
package com.discordsrv.common.component.renderer;
import com.discordsrv.api.component.EnhancedTextBuilder;
import com.discordsrv.api.discord.api.entity.DiscordUser;
import com.discordsrv.api.discord.api.entity.guild.DiscordGuild;
import com.discordsrv.api.discord.api.entity.guild.DiscordGuildMember;
import com.discordsrv.api.discord.api.entity.guild.DiscordRole;
import com.discordsrv.api.discord.entity.DiscordUser;
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.receive.discord.DiscordChatMessageProcessingEvent;
import com.discordsrv.common.DiscordSRV;
import com.discordsrv.common.component.util.ComponentUtil;

4
common/src/main/java/com/discordsrv/common/config/main/DiscordIgnoresConfig.java
View File

@ -18,8 +18,8 @@
package com.discordsrv.common.config.main;
import com.discordsrv.api.discord.api.entity.DiscordUser;
import com.discordsrv.api.discord.api.entity.guild.DiscordGuildMember;
import com.discordsrv.api.discord.entity.DiscordUser;
import com.discordsrv.api.discord.entity.guild.DiscordGuildMember;
import org.spongepowered.configurate.objectmapping.ConfigSerializable;
import org.spongepowered.configurate.objectmapping.meta.Comment;

2
common/src/main/java/com/discordsrv/common/config/main/channels/IMessageConfig.java
View File

@ -18,7 +18,7 @@
package com.discordsrv.common.config.main.channels;
import com.discordsrv.api.discord.api.entity.message.SendableDiscordMessage;
import com.discordsrv.api.discord.entity.message.SendableDiscordMessage;
public interface IMessageConfig {

4
common/src/main/java/com/discordsrv/common/config/main/channels/JoinMessageConfig.java
View File

@ -18,8 +18,8 @@
package com.discordsrv.common.config.main.channels;
import com.discordsrv.api.discord.api.entity.message.DiscordMessageEmbed;
import com.discordsrv.api.discord.api.entity.message.SendableDiscordMessage;
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.annotation.Untranslated;
import org.jetbrains.annotations.Nullable;

4
common/src/main/java/com/discordsrv/common/config/main/channels/LeaveMessageConfig.java
View File

@ -18,8 +18,8 @@
package com.discordsrv.common.config.main.channels;
import com.discordsrv.api.discord.api.entity.message.DiscordMessageEmbed;
import com.discordsrv.api.discord.api.entity.message.SendableDiscordMessage;
import com.discordsrv.api.discord.entity.message.DiscordMessageEmbed;
import com.discordsrv.api.discord.entity.message.SendableDiscordMessage;
import com.discordsrv.common.config.annotation.Untranslated;
import org.spongepowered.configurate.objectmapping.ConfigSerializable;

2
common/src/main/java/com/discordsrv/common/config/main/channels/MinecraftToDiscordChatConfig.java
View File

@ -18,7 +18,7 @@
package com.discordsrv.common.config.main.channels;
import com.discordsrv.api.discord.api.entity.message.SendableDiscordMessage;
import com.discordsrv.api.discord.entity.message.SendableDiscordMessage;
import com.discordsrv.common.config.annotation.Untranslated;
import org.spongepowered.configurate.objectmapping.ConfigSerializable;
import org.spongepowered.configurate.objectmapping.meta.Comment;

2
common/src/main/java/com/discordsrv/common/config/main/channels/StartMessageConfig.java
View File

@ -18,7 +18,7 @@
package com.discordsrv.common.config.main.channels;
import com.discordsrv.api.discord.api.entity.message.SendableDiscordMessage;
import com.discordsrv.api.discord.entity.message.SendableDiscordMessage;
import com.discordsrv.common.config.annotation.Untranslated;
import org.spongepowered.configurate.objectmapping.ConfigSerializable;

2
common/src/main/java/com/discordsrv/common/config/main/channels/StopMessageConfig.java
View File

@ -18,7 +18,7 @@
package com.discordsrv.common.config.main.channels;
import com.discordsrv.api.discord.api.entity.message.SendableDiscordMessage;
import com.discordsrv.api.discord.entity.message.SendableDiscordMessage;
import com.discordsrv.common.config.annotation.Untranslated;
import org.spongepowered.configurate.objectmapping.ConfigSerializable;

4
common/src/main/java/com/discordsrv/common/config/manager/manager/ConfigurateConfigManager.java
View File

@ -19,8 +19,8 @@
package com.discordsrv.common.config.manager.manager;
import com.discordsrv.api.color.Color;
import com.discordsrv.api.discord.api.entity.message.DiscordMessageEmbed;
import com.discordsrv.api.discord.api.entity.message.SendableDiscordMessage;
import com.discordsrv.api.discord.entity.message.DiscordMessageEmbed;
import com.discordsrv.api.discord.entity.message.SendableDiscordMessage;
import com.discordsrv.common.DiscordSRV;
import com.discordsrv.common.config.annotation.DefaultOnly;
import com.discordsrv.common.config.annotation.Order;

2
common/src/main/java/com/discordsrv/common/config/serializer/DiscordMessageEmbedSerializer.java
View File

@ -19,7 +19,7 @@
package com.discordsrv.common.config.serializer;
import com.discordsrv.api.color.Color;
import com.discordsrv.api.discord.api.entity.message.DiscordMessageEmbed;
import com.discordsrv.api.discord.entity.message.DiscordMessageEmbed;
import net.dv8tion.jda.api.entities.Role;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.spongepowered.configurate.ConfigurationNode;

4
common/src/main/java/com/discordsrv/common/config/serializer/SendableDiscordMessageSerializer.java
View File

@ -18,8 +18,8 @@
package com.discordsrv.common.config.serializer;
import com.discordsrv.api.discord.api.entity.message.DiscordMessageEmbed;
import com.discordsrv.api.discord.api.entity.message.SendableDiscordMessage;
import com.discordsrv.api.discord.entity.message.DiscordMessageEmbed;
import com.discordsrv.api.discord.entity.message.SendableDiscordMessage;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.spongepowered.configurate.ConfigurationNode;
import org.spongepowered.configurate.serialize.SerializationException;

20
common/src/main/java/com/discordsrv/common/discord/api/DiscordAPIImpl.java
View File

@ -20,16 +20,16 @@ package com.discordsrv.common.discord.api;
import club.minnced.discord.webhook.WebhookClient;
import club.minnced.discord.webhook.WebhookClientBuilder;
import com.discordsrv.api.discord.api.DiscordAPI;
import com.discordsrv.api.discord.api.entity.DiscordUser;
import com.discordsrv.api.discord.api.entity.channel.DiscordDMChannel;
import com.discordsrv.api.discord.api.entity.channel.DiscordMessageChannel;
import com.discordsrv.api.discord.api.entity.channel.DiscordTextChannel;
import com.discordsrv.api.discord.api.entity.channel.DiscordThreadChannel;
import com.discordsrv.api.discord.api.entity.guild.DiscordGuild;
import com.discordsrv.api.discord.api.entity.guild.DiscordRole;
import com.discordsrv.api.discord.api.exception.NotReadyException;
import com.discordsrv.api.discord.api.exception.RestErrorResponseException;
import com.discordsrv.api.discord.DiscordAPI;
import com.discordsrv.api.discord.entity.DiscordUser;
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.discord.entity.guild.DiscordGuild;
import com.discordsrv.api.discord.entity.guild.DiscordRole;
import com.discordsrv.api.discord.exception.NotReadyException;
import com.discordsrv.api.discord.exception.RestErrorResponseException;
import com.discordsrv.api.discord.connection.jda.errorresponse.ErrorCallbackContext;
import com.discordsrv.common.DiscordSRV;
import com.discordsrv.common.config.main.channels.base.BaseChannelConfig;

2
common/src/main/java/com/discordsrv/common/discord/api/ThreadChannelLookup.java
View File

@ -18,7 +18,7 @@
package com.discordsrv.common.discord.api;
import com.discordsrv.api.discord.api.entity.channel.DiscordThreadChannel;
import com.discordsrv.api.discord.entity.channel.DiscordThreadChannel;
import java.util.List;
import java.util.concurrent.CompletableFuture;

4
common/src/main/java/com/discordsrv/common/discord/api/entity/DiscordUserImpl.java
View File

@ -18,8 +18,8 @@
package com.discordsrv.common.discord.api.entity;
import com.discordsrv.api.discord.api.entity.DiscordUser;
import com.discordsrv.api.discord.api.entity.channel.DiscordDMChannel;
import com.discordsrv.api.discord.entity.DiscordUser;
import com.discordsrv.api.discord.entity.channel.DiscordDMChannel;
import com.discordsrv.common.DiscordSRV;
import com.discordsrv.common.discord.api.entity.channel.DiscordDMChannelImpl;
import net.dv8tion.jda.api.JDA;

8
common/src/main/java/com/discordsrv/common/discord/api/entity/channel/AbstractDiscordGuildMessageChannel.java
View File

@ -21,10 +21,10 @@ package com.discordsrv.common.discord.api.entity.channel;
import club.minnced.discord.webhook.WebhookClient;
import club.minnced.discord.webhook.receive.ReadonlyMessage;
import club.minnced.discord.webhook.send.WebhookMessageBuilder;
import com.discordsrv.api.discord.api.entity.channel.DiscordGuildMessageChannel;
import com.discordsrv.api.discord.api.entity.guild.DiscordGuild;
import com.discordsrv.api.discord.api.entity.message.ReceivedDiscordMessage;
import com.discordsrv.api.discord.api.entity.message.SendableDiscordMessage;
import com.discordsrv.api.discord.entity.channel.DiscordGuildMessageChannel;
import com.discordsrv.api.discord.entity.guild.DiscordGuild;
import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessage;
import com.discordsrv.api.discord.entity.message.SendableDiscordMessage;
import com.discordsrv.common.DiscordSRV;
import com.discordsrv.common.discord.api.entity.guild.DiscordGuildImpl;
import com.discordsrv.common.discord.api.entity.message.ReceivedDiscordMessageImpl;

2
common/src/main/java/com/discordsrv/common/discord/api/entity/channel/AbstractDiscordMessageChannel.java
View File

@ -18,7 +18,7 @@
package com.discordsrv.common.discord.api.entity.channel;
import com.discordsrv.api.discord.api.entity.channel.DiscordMessageChannel;
import com.discordsrv.api.discord.entity.channel.DiscordMessageChannel;
import com.discordsrv.common.DiscordSRV;
import net.dv8tion.jda.api.entities.*;

6
common/src/main/java/com/discordsrv/common/discord/api/entity/channel/AbstractDiscordThreadedGuildMessageChannel.java
View File

@ -18,9 +18,9 @@
package com.discordsrv.common.discord.api.entity.channel;
import com.discordsrv.api.discord.api.entity.channel.DiscordGuildMessageChannel;
import com.discordsrv.api.discord.api.entity.channel.DiscordThreadChannel;
import com.discordsrv.api.discord.api.entity.channel.DiscordThreadContainer;
import com.discordsrv.api.discord.entity.channel.DiscordGuildMessageChannel;
import com.discordsrv.api.discord.entity.channel.DiscordThreadChannel;
import com.discordsrv.api.discord.entity.channel.DiscordThreadContainer;
import com.discordsrv.common.DiscordSRV;
import net.dv8tion.jda.api.entities.GuildMessageChannel;
import net.dv8tion.jda.api.entities.IThreadContainer;

8
common/src/main/java/com/discordsrv/common/discord/api/entity/channel/DiscordDMChannelImpl.java
View File

@ -18,10 +18,10 @@
package com.discordsrv.common.discord.api.entity.channel;
import com.discordsrv.api.discord.api.entity.DiscordUser;
import com.discordsrv.api.discord.api.entity.channel.DiscordDMChannel;
import com.discordsrv.api.discord.api.entity.message.ReceivedDiscordMessage;
import com.discordsrv.api.discord.api.entity.message.SendableDiscordMessage;
import com.discordsrv.api.discord.entity.DiscordUser;
import com.discordsrv.api.discord.entity.channel.DiscordDMChannel;
import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessage;
import com.discordsrv.api.discord.entity.message.SendableDiscordMessage;
import com.discordsrv.common.DiscordSRV;
import com.discordsrv.common.discord.api.entity.DiscordUserImpl;
import com.discordsrv.common.discord.api.entity.message.ReceivedDiscordMessageImpl;

2
common/src/main/java/com/discordsrv/common/discord/api/entity/channel/DiscordNewsChannelImpl.java
View File

@ -18,7 +18,7 @@
package com.discordsrv.common.discord.api.entity.channel;
import com.discordsrv.api.discord.api.entity.channel.DiscordNewsChannel;
import com.discordsrv.api.discord.entity.channel.DiscordNewsChannel;
import com.discordsrv.common.DiscordSRV;
import net.dv8tion.jda.api.entities.NewsChannel;

2
common/src/main/java/com/discordsrv/common/discord/api/entity/channel/DiscordTextChannelImpl.java
View File

@ -18,7 +18,7 @@
package com.discordsrv.common.discord.api.entity.channel;
import com.discordsrv.api.discord.api.entity.channel.DiscordTextChannel;
import com.discordsrv.api.discord.entity.channel.DiscordTextChannel;
import com.discordsrv.common.DiscordSRV;
import net.dv8tion.jda.api.entities.TextChannel;
import org.jetbrains.annotations.Nullable;

6
common/src/main/java/com/discordsrv/common/discord/api/entity/channel/DiscordThreadChannelImpl.java
View File

@ -19,9 +19,9 @@
package com.discordsrv.common.discord.api.entity.channel;
import club.minnced.discord.webhook.WebhookClient;
import com.discordsrv.api.discord.api.entity.channel.DiscordTextChannel;
import com.discordsrv.api.discord.api.entity.channel.DiscordThreadChannel;
import com.discordsrv.api.discord.api.entity.guild.DiscordGuild;
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.common.DiscordSRV;
import com.discordsrv.common.discord.api.entity.guild.DiscordGuildImpl;
import net.dv8tion.jda.api.entities.IThreadContainer;

6
common/src/main/java/com/discordsrv/common/discord/api/entity/guild/DiscordGuildImpl.java
View File

@ -18,9 +18,9 @@
package com.discordsrv.common.discord.api.entity.guild;
import com.discordsrv.api.discord.api.entity.guild.DiscordGuild;
import com.discordsrv.api.discord.api.entity.guild.DiscordGuildMember;
import com.discordsrv.api.discord.api.entity.guild.DiscordRole;
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.common.DiscordSRV;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.Member;

6
common/src/main/java/com/discordsrv/common/discord/api/entity/guild/DiscordGuildMemberImpl.java
View File

@ -19,9 +19,9 @@
package com.discordsrv.common.discord.api.entity.guild;
import com.discordsrv.api.color.Color;
import com.discordsrv.api.discord.api.entity.guild.DiscordGuild;
import com.discordsrv.api.discord.api.entity.guild.DiscordGuildMember;
import com.discordsrv.api.discord.api.entity.guild.DiscordRole;
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.placeholder.annotation.Placeholder;
import com.discordsrv.api.placeholder.annotation.PlaceholderRemainder;
import com.discordsrv.common.DiscordSRV;

4
common/src/main/java/com/discordsrv/common/discord/api/entity/guild/DiscordRoleImpl.java
View File

@ -19,8 +19,8 @@
package com.discordsrv.common.discord.api.entity.guild;
import com.discordsrv.api.color.Color;
import com.discordsrv.api.discord.api.entity.guild.DiscordGuild;
import com.discordsrv.api.discord.api.entity.guild.DiscordRole;
import com.discordsrv.api.discord.entity.guild.DiscordGuild;
import com.discordsrv.api.discord.entity.guild.DiscordRole;
import com.discordsrv.common.DiscordSRV;
import net.dv8tion.jda.api.entities.Role;
import org.jetbrains.annotations.NotNull;

6
common/src/main/java/com/discordsrv/common/discord/api/entity/message/ReceivedDiscordMessageClusterImpl.java
View File

@ -18,9 +18,9 @@
package com.discordsrv.common.discord.api.entity.message;
import com.discordsrv.api.discord.api.entity.message.ReceivedDiscordMessage;
import com.discordsrv.api.discord.api.entity.message.ReceivedDiscordMessageCluster;
import com.discordsrv.api.discord.api.entity.message.SendableDiscordMessage;
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 org.jetbrains.annotations.NotNull;

22
common/src/main/java/com/discordsrv/common/discord/api/entity/message/ReceivedDiscordMessageImpl.java
View File

@ -25,17 +25,17 @@ import club.minnced.discord.webhook.receive.ReadonlyMessage;
import club.minnced.discord.webhook.receive.ReadonlyUser;
import club.minnced.discord.webhook.send.WebhookEmbed;
import com.discordsrv.api.color.Color;
import com.discordsrv.api.discord.api.entity.DiscordUser;
import com.discordsrv.api.discord.api.entity.channel.DiscordDMChannel;
import com.discordsrv.api.discord.api.entity.channel.DiscordMessageChannel;
import com.discordsrv.api.discord.api.entity.channel.DiscordTextChannel;
import com.discordsrv.api.discord.api.entity.channel.DiscordThreadChannel;
import com.discordsrv.api.discord.api.entity.guild.DiscordGuildMember;
import com.discordsrv.api.discord.api.entity.message.DiscordMessageEmbed;
import com.discordsrv.api.discord.api.entity.message.ReceivedDiscordMessage;
import com.discordsrv.api.discord.api.entity.message.SendableDiscordMessage;
import com.discordsrv.api.discord.api.entity.message.impl.SendableDiscordMessageImpl;
import com.discordsrv.api.discord.api.exception.RestErrorResponseException;
import com.discordsrv.api.discord.entity.DiscordUser;
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.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.discord.entity.message.impl.SendableDiscordMessageImpl;
import com.discordsrv.api.discord.exception.RestErrorResponseException;
import com.discordsrv.api.placeholder.annotation.Placeholder;
import com.discordsrv.api.placeholder.annotation.PlaceholderRemainder;
import com.discordsrv.common.DiscordSRV;

6
common/src/main/java/com/discordsrv/common/discord/api/entity/message/util/SendableDiscordMessageUtil.java
View File

@ -19,9 +19,9 @@
package com.discordsrv.common.discord.api.entity.message.util;
import club.minnced.discord.webhook.send.WebhookMessageBuilder;
import com.discordsrv.api.discord.api.entity.message.AllowedMention;
import com.discordsrv.api.discord.api.entity.message.DiscordMessageEmbed;
import com.discordsrv.api.discord.api.entity.message.SendableDiscordMessage;
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 net.dv8tion.jda.api.MessageBuilder;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.MessageEmbed;

4
common/src/main/java/com/discordsrv/common/discord/connection/jda/JDAConnectionManager.java
View File

@ -18,8 +18,8 @@
package com.discordsrv.common.discord.connection.jda;
import com.discordsrv.api.discord.api.entity.DiscordUser;
import com.discordsrv.api.discord.connection.DiscordConnectionDetails;
import com.discordsrv.api.discord.entity.DiscordUser;
import com.discordsrv.api.discord.connection.jda.DiscordConnectionDetails;
import com.discordsrv.api.discord.connection.jda.errorresponse.ErrorCallbackContext;
import com.discordsrv.api.event.bus.EventPriority;
import com.discordsrv.api.event.bus.Subscribe;

2
common/src/main/java/com/discordsrv/common/discord/details/DiscordConnectionDetailsImpl.java
View File

@ -18,7 +18,7 @@
package com.discordsrv.common.discord.details;
import com.discordsrv.api.discord.connection.DiscordConnectionDetails;
import com.discordsrv.api.discord.connection.jda.DiscordConnectionDetails;
import com.discordsrv.common.DiscordSRV;
import com.discordsrv.common.exception.util.ExceptionUtil;
import net.dv8tion.jda.api.requests.GatewayIntent;

4
common/src/main/java/com/discordsrv/common/groupsync/GroupSyncModule.java
View File

@ -18,8 +18,8 @@
package com.discordsrv.common.groupsync;
import com.discordsrv.api.discord.api.entity.guild.DiscordGuildMember;
import com.discordsrv.api.discord.api.entity.guild.DiscordRole;
import com.discordsrv.api.discord.entity.guild.DiscordGuildMember;
import com.discordsrv.api.discord.entity.guild.DiscordRole;
import com.discordsrv.api.discord.events.member.role.DiscordMemberRoleAddEvent;
import com.discordsrv.api.discord.events.member.role.DiscordMemberRoleRemoveEvent;
import com.discordsrv.api.event.bus.Subscribe;

8
common/src/main/java/com/discordsrv/common/messageforwarding/discord/DiscordChatMessageModule.java
View File

@ -21,10 +21,10 @@ package com.discordsrv.common.messageforwarding.discord;
import com.discordsrv.api.channel.GameChannel;
import com.discordsrv.api.component.EnhancedTextBuilder;
import com.discordsrv.api.component.MinecraftComponent;
import com.discordsrv.api.discord.api.entity.DiscordUser;
import com.discordsrv.api.discord.api.entity.channel.DiscordMessageChannel;
import com.discordsrv.api.discord.api.entity.guild.DiscordGuildMember;
import com.discordsrv.api.discord.api.entity.message.ReceivedDiscordMessage;
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.message.ReceivedDiscordMessage;
import com.discordsrv.api.discord.events.message.DiscordMessageReceiveEvent;
import com.discordsrv.api.event.bus.Subscribe;
import com.discordsrv.api.event.events.message.receive.discord.DiscordChatMessageProcessingEvent;

18
common/src/main/java/com/discordsrv/common/messageforwarding/discord/DiscordMessageMirroringModule.java
View File

@ -19,15 +19,15 @@
package com.discordsrv.common.messageforwarding.discord;
import com.discordsrv.api.channel.GameChannel;
import com.discordsrv.api.discord.api.entity.DiscordUser;
import com.discordsrv.api.discord.api.entity.channel.DiscordGuildMessageChannel;
import com.discordsrv.api.discord.api.entity.channel.DiscordMessageChannel;
import com.discordsrv.api.discord.api.entity.channel.DiscordTextChannel;
import com.discordsrv.api.discord.api.entity.channel.DiscordThreadChannel;
import com.discordsrv.api.discord.api.entity.guild.DiscordGuildMember;
import com.discordsrv.api.discord.api.entity.message.DiscordMessageEmbed;
import com.discordsrv.api.discord.api.entity.message.ReceivedDiscordMessage;
import com.discordsrv.api.discord.api.entity.message.SendableDiscordMessage;
import com.discordsrv.api.discord.entity.DiscordUser;
import com.discordsrv.api.discord.entity.channel.DiscordGuildMessageChannel;
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.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.discord.events.message.DiscordMessageDeleteEvent;
import com.discordsrv.api.discord.events.message.DiscordMessageUpdateEvent;
import com.discordsrv.api.event.bus.Subscribe;

12
common/src/main/java/com/discordsrv/common/messageforwarding/game/AbstractGameMessageModule.java
View File

@ -19,12 +19,12 @@
package com.discordsrv.common.messageforwarding.game;
import com.discordsrv.api.channel.GameChannel;
import com.discordsrv.api.discord.api.entity.channel.DiscordMessageChannel;
import com.discordsrv.api.discord.api.entity.channel.DiscordTextChannel;
import com.discordsrv.api.discord.api.entity.channel.DiscordThreadChannel;
import com.discordsrv.api.discord.api.entity.message.ReceivedDiscordMessage;
import com.discordsrv.api.discord.api.entity.message.ReceivedDiscordMessageCluster;
import com.discordsrv.api.discord.api.entity.message.SendableDiscordMessage;
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.discord.entity.message.ReceivedDiscordMessageCluster;
import com.discordsrv.api.discord.entity.message.SendableDiscordMessage;
import com.discordsrv.api.discord.connection.jda.errorresponse.ErrorCallbackContext;
import com.discordsrv.api.event.events.message.receive.game.AbstractGameMessageReceiveEvent;
import com.discordsrv.api.placeholder.FormattedText;

2
common/src/main/java/com/discordsrv/common/messageforwarding/game/JoinMessageModule.java
View File

@ -18,7 +18,7 @@
package com.discordsrv.common.messageforwarding.game;
import com.discordsrv.api.discord.api.entity.message.ReceivedDiscordMessageCluster;
import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster;
import com.discordsrv.api.event.bus.EventPriority;
import com.discordsrv.api.event.bus.Subscribe;
import com.discordsrv.api.event.events.message.forward.game.JoinMessageForwardedEvent;

2
common/src/main/java/com/discordsrv/common/messageforwarding/game/LeaveMessageModule.java
View File

@ -18,7 +18,7 @@
package com.discordsrv.common.messageforwarding.game;
import com.discordsrv.api.discord.api.entity.message.ReceivedDiscordMessageCluster;
import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster;
import com.discordsrv.api.event.bus.EventPriority;
import com.discordsrv.api.event.bus.Subscribe;
import com.discordsrv.api.event.events.message.forward.game.LeaveMessageForwardedEvent;

16
common/src/main/java/com/discordsrv/common/messageforwarding/game/MinecraftToDiscordChatModule.java
View File

@ -19,14 +19,14 @@
package com.discordsrv.common.messageforwarding.game;
import com.discordsrv.api.channel.GameChannel;
import com.discordsrv.api.discord.api.entity.channel.DiscordMessageChannel;
import com.discordsrv.api.discord.api.entity.channel.DiscordTextChannel;
import com.discordsrv.api.discord.api.entity.channel.DiscordThreadChannel;
import com.discordsrv.api.discord.api.entity.guild.DiscordGuild;
import com.discordsrv.api.discord.api.entity.message.ReceivedDiscordMessage;
import com.discordsrv.api.discord.api.entity.message.ReceivedDiscordMessageCluster;
import com.discordsrv.api.discord.api.entity.message.SendableDiscordMessage;
import com.discordsrv.api.discord.api.util.DiscordFormattingUtil;
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.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;

2
common/src/main/java/com/discordsrv/common/messageforwarding/game/StartMessageModule.java
View File

@ -18,7 +18,7 @@
package com.discordsrv.common.messageforwarding.game;
import com.discordsrv.api.discord.api.entity.message.ReceivedDiscordMessageCluster;
import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster;
import com.discordsrv.api.event.events.message.receive.game.AbstractGameMessageReceiveEvent;
import com.discordsrv.common.DiscordSRV;
import com.discordsrv.common.config.main.channels.StartMessageConfig;

2
common/src/main/java/com/discordsrv/common/messageforwarding/game/StopMessageModule.java
View File

@ -18,7 +18,7 @@
package com.discordsrv.common.messageforwarding.game;
import com.discordsrv.api.discord.api.entity.message.ReceivedDiscordMessageCluster;
import com.discordsrv.api.discord.entity.message.ReceivedDiscordMessageCluster;
import com.discordsrv.api.event.events.message.receive.game.AbstractGameMessageReceiveEvent;
import com.discordsrv.common.DiscordSRV;
import com.discordsrv.common.config.main.channels.StopMessageConfig;