diff --git a/core/src/main/java/com/xujiayao/discord_mc_chat/client/ClientHandler.java b/core/src/main/java/com/xujiayao/discord_mc_chat/client/ClientHandler.java index 4e627c80..58b6cb50 100644 --- a/core/src/main/java/com/xujiayao/discord_mc_chat/client/ClientHandler.java +++ b/core/src/main/java/com/xujiayao/discord_mc_chat/client/ClientHandler.java @@ -26,7 +26,7 @@ import com.xujiayao.discord_mc_chat.network.packets.commands.link.OpSyncPacket; import com.xujiayao.discord_mc_chat.network.packets.commands.unlink.UnlinkResponsePacket; import com.xujiayao.discord_mc_chat.network.packets.events.DiscordRelayPacket; import com.xujiayao.discord_mc_chat.network.packets.events.MinecraftRelayPacket; -import com.xujiayao.discord_mc_chat.network.packets.events.TextSegment; +import com.xujiayao.discord_mc_chat.utils.message.TextSegment; import com.xujiayao.discord_mc_chat.network.packets.misc.KeepAlivePacket; import com.xujiayao.discord_mc_chat.network.packets.misc.LatencyPongPacket; import com.xujiayao.discord_mc_chat.utils.CryptUtils; diff --git a/core/src/main/java/com/xujiayao/discord_mc_chat/network/packets/events/DiscordRelayPacket.java b/core/src/main/java/com/xujiayao/discord_mc_chat/network/packets/events/DiscordRelayPacket.java index 6199e1bc..0b79aaf1 100644 --- a/core/src/main/java/com/xujiayao/discord_mc_chat/network/packets/events/DiscordRelayPacket.java +++ b/core/src/main/java/com/xujiayao/discord_mc_chat/network/packets/events/DiscordRelayPacket.java @@ -1,6 +1,7 @@ package com.xujiayao.discord_mc_chat.network.packets.events; import com.xujiayao.discord_mc_chat.network.packets.Packet; +import com.xujiayao.discord_mc_chat.utils.message.TextSegment; import java.util.List; diff --git a/core/src/main/java/com/xujiayao/discord_mc_chat/network/packets/events/MinecraftRelayPacket.java b/core/src/main/java/com/xujiayao/discord_mc_chat/network/packets/events/MinecraftRelayPacket.java index 644ddd29..cfae39dd 100644 --- a/core/src/main/java/com/xujiayao/discord_mc_chat/network/packets/events/MinecraftRelayPacket.java +++ b/core/src/main/java/com/xujiayao/discord_mc_chat/network/packets/events/MinecraftRelayPacket.java @@ -1,6 +1,7 @@ package com.xujiayao.discord_mc_chat.network.packets.events; import com.xujiayao.discord_mc_chat.network.packets.Packet; +import com.xujiayao.discord_mc_chat.utils.message.TextSegment; import java.util.List; diff --git a/core/src/main/java/com/xujiayao/discord_mc_chat/server/ServerHandler.java b/core/src/main/java/com/xujiayao/discord_mc_chat/server/ServerHandler.java index 6194c25b..fbaff8c1 100644 --- a/core/src/main/java/com/xujiayao/discord_mc_chat/server/ServerHandler.java +++ b/core/src/main/java/com/xujiayao/discord_mc_chat/server/ServerHandler.java @@ -22,7 +22,7 @@ import com.xujiayao.discord_mc_chat.network.packets.commands.unlink.UnlinkReques import com.xujiayao.discord_mc_chat.network.packets.commands.unlink.UnlinkResponsePacket; import com.xujiayao.discord_mc_chat.network.packets.events.MinecraftEventPacket; import com.xujiayao.discord_mc_chat.network.packets.events.MinecraftRelayPacket; -import com.xujiayao.discord_mc_chat.network.packets.events.TextSegment; +import com.xujiayao.discord_mc_chat.utils.message.TextSegment; import com.xujiayao.discord_mc_chat.network.packets.misc.KeepAlivePacket; import com.xujiayao.discord_mc_chat.network.packets.misc.LatencyPingPacket; import com.xujiayao.discord_mc_chat.network.packets.misc.LatencyPongPacket; diff --git a/core/src/main/java/com/xujiayao/discord_mc_chat/server/discord/DiscordEventHandler.java b/core/src/main/java/com/xujiayao/discord_mc_chat/server/discord/DiscordEventHandler.java index 3614369d..303e3606 100644 --- a/core/src/main/java/com/xujiayao/discord_mc_chat/server/discord/DiscordEventHandler.java +++ b/core/src/main/java/com/xujiayao/discord_mc_chat/server/discord/DiscordEventHandler.java @@ -4,7 +4,7 @@ import com.xujiayao.discord_mc_chat.commands.CommandManager; import com.xujiayao.discord_mc_chat.commands.impl.StatsCommand; import com.xujiayao.discord_mc_chat.network.NetworkManager; import com.xujiayao.discord_mc_chat.network.packets.events.DiscordRelayPacket; -import com.xujiayao.discord_mc_chat.network.packets.events.TextSegment; +import com.xujiayao.discord_mc_chat.utils.message.TextSegment; import com.xujiayao.discord_mc_chat.server.message.DiscordMessageParser; import com.xujiayao.discord_mc_chat.utils.LogFileUtils; import com.xujiayao.discord_mc_chat.utils.config.ConfigManager; diff --git a/core/src/main/java/com/xujiayao/discord_mc_chat/server/message/DiscordMessageParser.java b/core/src/main/java/com/xujiayao/discord_mc_chat/server/message/DiscordMessageParser.java index 0e38751e..b2ea0915 100644 --- a/core/src/main/java/com/xujiayao/discord_mc_chat/server/message/DiscordMessageParser.java +++ b/core/src/main/java/com/xujiayao/discord_mc_chat/server/message/DiscordMessageParser.java @@ -1,7 +1,7 @@ package com.xujiayao.discord_mc_chat.server.message; import com.fasterxml.jackson.databind.JsonNode; -import com.xujiayao.discord_mc_chat.network.packets.events.TextSegment; +import com.xujiayao.discord_mc_chat.utils.message.TextSegment; import com.xujiayao.discord_mc_chat.server.linking.LinkedAccountManager; import com.xujiayao.discord_mc_chat.utils.config.ConfigManager; import com.xujiayao.discord_mc_chat.utils.i18n.I18nManager; diff --git a/core/src/main/java/com/xujiayao/discord_mc_chat/server/message/MinecraftMessageParser.java b/core/src/main/java/com/xujiayao/discord_mc_chat/server/message/MinecraftMessageParser.java index f4f14676..40897420 100644 --- a/core/src/main/java/com/xujiayao/discord_mc_chat/server/message/MinecraftMessageParser.java +++ b/core/src/main/java/com/xujiayao/discord_mc_chat/server/message/MinecraftMessageParser.java @@ -1,7 +1,7 @@ package com.xujiayao.discord_mc_chat.server.message; import com.fasterxml.jackson.databind.JsonNode; -import com.xujiayao.discord_mc_chat.network.packets.events.TextSegment; +import com.xujiayao.discord_mc_chat.utils.message.TextSegment; import com.xujiayao.discord_mc_chat.server.discord.DiscordManager; import com.xujiayao.discord_mc_chat.server.linking.LinkedAccountManager; import com.xujiayao.discord_mc_chat.utils.MojangUtils; diff --git a/core/src/main/java/com/xujiayao/discord_mc_chat/utils/events/CoreEvents.java b/core/src/main/java/com/xujiayao/discord_mc_chat/utils/events/CoreEvents.java index 8776f991..88588faa 100644 --- a/core/src/main/java/com/xujiayao/discord_mc_chat/utils/events/CoreEvents.java +++ b/core/src/main/java/com/xujiayao/discord_mc_chat/utils/events/CoreEvents.java @@ -1,7 +1,7 @@ package com.xujiayao.discord_mc_chat.utils.events; import com.xujiayao.discord_mc_chat.commands.CommandSender; -import com.xujiayao.discord_mc_chat.network.packets.events.TextSegment; +import com.xujiayao.discord_mc_chat.utils.message.TextSegment; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/com/xujiayao/discord_mc_chat/network/packets/events/TextSegment.java b/core/src/main/java/com/xujiayao/discord_mc_chat/utils/message/TextSegment.java similarity index 95% rename from core/src/main/java/com/xujiayao/discord_mc_chat/network/packets/events/TextSegment.java rename to core/src/main/java/com/xujiayao/discord_mc_chat/utils/message/TextSegment.java index cff05200..8578d85a 100644 --- a/core/src/main/java/com/xujiayao/discord_mc_chat/network/packets/events/TextSegment.java +++ b/core/src/main/java/com/xujiayao/discord_mc_chat/utils/message/TextSegment.java @@ -1,4 +1,6 @@ -package com.xujiayao.discord_mc_chat.network.packets.events; +package com.xujiayao.discord_mc_chat.utils.message; + +import com.xujiayao.discord_mc_chat.network.packets.events.DiscordRelayPacket; import java.io.Serial; import java.io.Serializable; diff --git a/minecraft/src/main/java/com/xujiayao/discord_mc_chat/minecraft/events/MinecraftEventHandler.java b/minecraft/src/main/java/com/xujiayao/discord_mc_chat/minecraft/events/MinecraftEventHandler.java index 8d6a377f..e7e3763a 100644 --- a/minecraft/src/main/java/com/xujiayao/discord_mc_chat/minecraft/events/MinecraftEventHandler.java +++ b/minecraft/src/main/java/com/xujiayao/discord_mc_chat/minecraft/events/MinecraftEventHandler.java @@ -13,7 +13,7 @@ import com.xujiayao.discord_mc_chat.network.NetworkManager; import com.xujiayao.discord_mc_chat.network.packets.commands.info.InfoResponsePacket; import com.xujiayao.discord_mc_chat.network.packets.commands.link.LinkRequestPacket; import com.xujiayao.discord_mc_chat.network.packets.events.MinecraftEventPacket; -import com.xujiayao.discord_mc_chat.network.packets.events.TextSegment; +import com.xujiayao.discord_mc_chat.utils.message.TextSegment; import com.xujiayao.discord_mc_chat.utils.EnvironmentUtils; import com.xujiayao.discord_mc_chat.utils.config.ConfigManager; import com.xujiayao.discord_mc_chat.utils.config.ModeManager;