diff --git a/src/main/java/top/focess/qq/FocessQQ.java b/src/main/java/top/focess/qq/FocessQQ.java index 2a8781a..c7f9416 100755 --- a/src/main/java/top/focess/qq/FocessQQ.java +++ b/src/main/java/top/focess/qq/FocessQQ.java @@ -5,6 +5,8 @@ import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; import top.focess.qq.api.bot.*; +import top.focess.qq.api.bot.contact.Friend; +import top.focess.qq.api.bot.contact.Group; import top.focess.qq.api.command.*; import top.focess.qq.api.command.converter.CommandDataConverter; import top.focess.qq.api.command.converter.PluginDataConverter; diff --git a/src/main/java/top/focess/qq/api/bot/Bot.java b/src/main/java/top/focess/qq/api/bot/Bot.java index 02fcc0d..9b4da35 100644 --- a/src/main/java/top/focess/qq/api/bot/Bot.java +++ b/src/main/java/top/focess/qq/api/bot/Bot.java @@ -2,6 +2,8 @@ import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; +import top.focess.qq.api.bot.contact.Friend; +import top.focess.qq.api.bot.contact.Group; import top.focess.qq.api.plugin.Plugin; import java.util.List; diff --git a/src/main/java/top/focess/qq/api/bot/Contact.java b/src/main/java/top/focess/qq/api/bot/contact/Contact.java similarity index 81% rename from src/main/java/top/focess/qq/api/bot/Contact.java rename to src/main/java/top/focess/qq/api/bot/contact/Contact.java index 5ca3023..3e0b524 100644 --- a/src/main/java/top/focess/qq/api/bot/Contact.java +++ b/src/main/java/top/focess/qq/api/bot/contact/Contact.java @@ -1,4 +1,6 @@ -package top.focess.qq.api.bot; +package top.focess.qq.api.bot.contact; + +import top.focess.qq.api.bot.Bot; public interface Contact { diff --git a/src/main/java/top/focess/qq/api/bot/Friend.java b/src/main/java/top/focess/qq/api/bot/contact/Friend.java similarity index 91% rename from src/main/java/top/focess/qq/api/bot/Friend.java rename to src/main/java/top/focess/qq/api/bot/contact/Friend.java index 6446faf..a895dca 100644 --- a/src/main/java/top/focess/qq/api/bot/Friend.java +++ b/src/main/java/top/focess/qq/api/bot/contact/Friend.java @@ -1,4 +1,4 @@ -package top.focess.qq.api.bot; +package top.focess.qq.api.bot.contact; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/top/focess/qq/api/bot/Group.java b/src/main/java/top/focess/qq/api/bot/contact/Group.java similarity index 94% rename from src/main/java/top/focess/qq/api/bot/Group.java rename to src/main/java/top/focess/qq/api/bot/contact/Group.java index dc4c2b6..b7dcebc 100644 --- a/src/main/java/top/focess/qq/api/bot/Group.java +++ b/src/main/java/top/focess/qq/api/bot/contact/Group.java @@ -1,4 +1,4 @@ -package top.focess.qq.api.bot; +package top.focess.qq.api.bot.contact; import org.checkerframework.checker.nullness.qual.NonNull; diff --git a/src/main/java/top/focess/qq/api/bot/Member.java b/src/main/java/top/focess/qq/api/bot/contact/Member.java similarity index 93% rename from src/main/java/top/focess/qq/api/bot/Member.java rename to src/main/java/top/focess/qq/api/bot/contact/Member.java index 76183ec..c516c49 100644 --- a/src/main/java/top/focess/qq/api/bot/Member.java +++ b/src/main/java/top/focess/qq/api/bot/contact/Member.java @@ -1,4 +1,4 @@ -package top.focess.qq.api.bot; +package top.focess.qq.api.bot.contact; import top.focess.qq.api.command.CommandPermission; diff --git a/src/main/java/top/focess/qq/api/bot/OtherClient.java b/src/main/java/top/focess/qq/api/bot/contact/OtherClient.java similarity index 81% rename from src/main/java/top/focess/qq/api/bot/OtherClient.java rename to src/main/java/top/focess/qq/api/bot/contact/OtherClient.java index 7a1540e..1dd756f 100644 --- a/src/main/java/top/focess/qq/api/bot/OtherClient.java +++ b/src/main/java/top/focess/qq/api/bot/contact/OtherClient.java @@ -1,4 +1,4 @@ -package top.focess.qq.api.bot; +package top.focess.qq.api.bot.contact; public interface OtherClient extends Contact{ diff --git a/src/main/java/top/focess/qq/api/bot/Speaker.java b/src/main/java/top/focess/qq/api/bot/contact/Speaker.java similarity index 56% rename from src/main/java/top/focess/qq/api/bot/Speaker.java rename to src/main/java/top/focess/qq/api/bot/contact/Speaker.java index 74ca69f..54d49ea 100644 --- a/src/main/java/top/focess/qq/api/bot/Speaker.java +++ b/src/main/java/top/focess/qq/api/bot/contact/Speaker.java @@ -1,4 +1,4 @@ -package top.focess.qq.api.bot; +package top.focess.qq.api.bot.contact; public interface Speaker extends Transmitter{ diff --git a/src/main/java/top/focess/qq/api/bot/Stranger.java b/src/main/java/top/focess/qq/api/bot/contact/Stranger.java similarity index 82% rename from src/main/java/top/focess/qq/api/bot/Stranger.java rename to src/main/java/top/focess/qq/api/bot/contact/Stranger.java index d2a6535..f44e7fc 100644 --- a/src/main/java/top/focess/qq/api/bot/Stranger.java +++ b/src/main/java/top/focess/qq/api/bot/contact/Stranger.java @@ -1,4 +1,4 @@ -package top.focess.qq.api.bot; +package top.focess.qq.api.bot.contact; public interface Stranger extends Transmitter { diff --git a/src/main/java/top/focess/qq/api/bot/Transmitter.java b/src/main/java/top/focess/qq/api/bot/contact/Transmitter.java similarity index 89% rename from src/main/java/top/focess/qq/api/bot/Transmitter.java rename to src/main/java/top/focess/qq/api/bot/contact/Transmitter.java index eaa014f..6fe6cb5 100644 --- a/src/main/java/top/focess/qq/api/bot/Transmitter.java +++ b/src/main/java/top/focess/qq/api/bot/contact/Transmitter.java @@ -1,4 +1,4 @@ -package top.focess.qq.api.bot; +package top.focess.qq.api.bot.contact; import net.mamoe.mirai.message.data.Image; import net.mamoe.mirai.utils.ExternalResource; diff --git a/src/main/java/top/focess/qq/api/command/CommandSender.java b/src/main/java/top/focess/qq/api/command/CommandSender.java index 81bf120..b879e24 100755 --- a/src/main/java/top/focess/qq/api/command/CommandSender.java +++ b/src/main/java/top/focess/qq/api/command/CommandSender.java @@ -7,9 +7,9 @@ import org.checkerframework.checker.nullness.qual.Nullable; import top.focess.qq.FocessQQ; import top.focess.qq.api.bot.Bot; -import top.focess.qq.api.bot.Friend; -import top.focess.qq.api.bot.Member; -import top.focess.qq.api.bot.Stranger; +import top.focess.qq.api.bot.contact.Friend; +import top.focess.qq.api.bot.contact.Member; +import top.focess.qq.api.bot.contact.Stranger; import top.focess.qq.api.plugin.Plugin; import top.focess.qq.api.util.IOHandler; import top.focess.qq.api.util.session.Session; diff --git a/src/main/java/top/focess/qq/api/event/bot/BotPreSendMessageEvent.java b/src/main/java/top/focess/qq/api/event/bot/BotPreSendMessageEvent.java index 71bfc7a..a61cf60 100644 --- a/src/main/java/top/focess/qq/api/event/bot/BotPreSendMessageEvent.java +++ b/src/main/java/top/focess/qq/api/event/bot/BotPreSendMessageEvent.java @@ -2,7 +2,7 @@ import net.mamoe.mirai.event.events.MessagePreSendEvent; import top.focess.qq.api.bot.Bot; -import top.focess.qq.api.bot.Contact; +import top.focess.qq.api.bot.contact.Contact; import top.focess.qq.api.bot.message.Message; import top.focess.qq.api.event.ListenerHandler; diff --git a/src/main/java/top/focess/qq/api/event/bot/BotSendMessageEvent.java b/src/main/java/top/focess/qq/api/event/bot/BotSendMessageEvent.java index 1142f5c..0f1e4ba 100644 --- a/src/main/java/top/focess/qq/api/event/bot/BotSendMessageEvent.java +++ b/src/main/java/top/focess/qq/api/event/bot/BotSendMessageEvent.java @@ -1,7 +1,7 @@ package top.focess.qq.api.event.bot; import top.focess.qq.api.bot.Bot; -import top.focess.qq.api.bot.Contact; +import top.focess.qq.api.bot.contact.Contact; import top.focess.qq.api.bot.message.Message; import top.focess.qq.api.event.ListenerHandler; diff --git a/src/main/java/top/focess/qq/api/event/bot/FriendInputStatusEvent.java b/src/main/java/top/focess/qq/api/event/bot/FriendInputStatusEvent.java index b1bb81b..9d1012d 100644 --- a/src/main/java/top/focess/qq/api/event/bot/FriendInputStatusEvent.java +++ b/src/main/java/top/focess/qq/api/event/bot/FriendInputStatusEvent.java @@ -1,7 +1,7 @@ package top.focess.qq.api.event.bot; import top.focess.qq.api.bot.Bot; -import top.focess.qq.api.bot.Friend; +import top.focess.qq.api.bot.contact.Friend; import top.focess.qq.api.event.ListenerHandler; /** diff --git a/src/main/java/top/focess/qq/api/event/chat/FriendChatEvent.java b/src/main/java/top/focess/qq/api/event/chat/FriendChatEvent.java index a3881d0..0033720 100644 --- a/src/main/java/top/focess/qq/api/event/chat/FriendChatEvent.java +++ b/src/main/java/top/focess/qq/api/event/chat/FriendChatEvent.java @@ -1,7 +1,7 @@ package top.focess.qq.api.event.chat; import top.focess.qq.api.bot.Bot; -import top.focess.qq.api.bot.Friend; +import top.focess.qq.api.bot.contact.Friend; import top.focess.qq.api.bot.message.MessageChain; import top.focess.qq.api.bot.message.MessageSource; import top.focess.qq.api.event.ListenerHandler; diff --git a/src/main/java/top/focess/qq/api/event/chat/GroupChatEvent.java b/src/main/java/top/focess/qq/api/event/chat/GroupChatEvent.java index a87836f..e67294a 100644 --- a/src/main/java/top/focess/qq/api/event/chat/GroupChatEvent.java +++ b/src/main/java/top/focess/qq/api/event/chat/GroupChatEvent.java @@ -1,8 +1,8 @@ package top.focess.qq.api.event.chat; import top.focess.qq.api.bot.Bot; -import top.focess.qq.api.bot.Group; -import top.focess.qq.api.bot.Member; +import top.focess.qq.api.bot.contact.Group; +import top.focess.qq.api.bot.contact.Member; import top.focess.qq.api.bot.message.MessageChain; import top.focess.qq.api.bot.message.MessageSource; import top.focess.qq.api.event.ListenerHandler; diff --git a/src/main/java/top/focess/qq/api/event/chat/StrangerChatEvent.java b/src/main/java/top/focess/qq/api/event/chat/StrangerChatEvent.java index 02c141f..584123b 100644 --- a/src/main/java/top/focess/qq/api/event/chat/StrangerChatEvent.java +++ b/src/main/java/top/focess/qq/api/event/chat/StrangerChatEvent.java @@ -1,7 +1,7 @@ package top.focess.qq.api.event.chat; import top.focess.qq.api.bot.Bot; -import top.focess.qq.api.bot.Stranger; +import top.focess.qq.api.bot.contact.Stranger; import top.focess.qq.api.bot.message.MessageChain; import top.focess.qq.api.bot.message.MessageSource; import top.focess.qq.api.event.ListenerHandler; diff --git a/src/main/java/top/focess/qq/api/event/message/FriendMessageEvent.java b/src/main/java/top/focess/qq/api/event/message/FriendMessageEvent.java index 089f6c4..01d9a00 100644 --- a/src/main/java/top/focess/qq/api/event/message/FriendMessageEvent.java +++ b/src/main/java/top/focess/qq/api/event/message/FriendMessageEvent.java @@ -1,7 +1,7 @@ package top.focess.qq.api.event.message; import top.focess.qq.api.bot.Bot; -import top.focess.qq.api.bot.Friend; +import top.focess.qq.api.bot.contact.Friend; import top.focess.qq.api.bot.message.MessageChain; import top.focess.qq.api.bot.message.MessageSource; import top.focess.qq.api.event.ListenerHandler; diff --git a/src/main/java/top/focess/qq/api/event/message/GroupMessageEvent.java b/src/main/java/top/focess/qq/api/event/message/GroupMessageEvent.java index 1bff493..ad04c29 100644 --- a/src/main/java/top/focess/qq/api/event/message/GroupMessageEvent.java +++ b/src/main/java/top/focess/qq/api/event/message/GroupMessageEvent.java @@ -1,8 +1,8 @@ package top.focess.qq.api.event.message; import top.focess.qq.api.bot.Bot; -import top.focess.qq.api.bot.Group; -import top.focess.qq.api.bot.Member; +import top.focess.qq.api.bot.contact.Group; +import top.focess.qq.api.bot.contact.Member; import top.focess.qq.api.bot.message.MessageChain; import top.focess.qq.api.bot.message.MessageSource; import top.focess.qq.api.event.ListenerHandler; diff --git a/src/main/java/top/focess/qq/api/event/message/StrangerMessageEvent.java b/src/main/java/top/focess/qq/api/event/message/StrangerMessageEvent.java index 9b46d79..88509c3 100644 --- a/src/main/java/top/focess/qq/api/event/message/StrangerMessageEvent.java +++ b/src/main/java/top/focess/qq/api/event/message/StrangerMessageEvent.java @@ -1,7 +1,7 @@ package top.focess.qq.api.event.message; import top.focess.qq.api.bot.Bot; -import top.focess.qq.api.bot.Stranger; +import top.focess.qq.api.bot.contact.Stranger; import top.focess.qq.api.bot.message.MessageChain; import top.focess.qq.api.bot.message.MessageSource; import top.focess.qq.api.event.ListenerHandler; diff --git a/src/main/java/top/focess/qq/api/event/recall/FriendRecallEvent.java b/src/main/java/top/focess/qq/api/event/recall/FriendRecallEvent.java index 3efd43f..df5ae4c 100644 --- a/src/main/java/top/focess/qq/api/event/recall/FriendRecallEvent.java +++ b/src/main/java/top/focess/qq/api/event/recall/FriendRecallEvent.java @@ -1,7 +1,7 @@ package top.focess.qq.api.event.recall; import top.focess.qq.api.bot.Bot; -import top.focess.qq.api.bot.Friend; +import top.focess.qq.api.bot.contact.Friend; import top.focess.qq.api.event.ListenerHandler; import top.focess.qq.api.event.bot.BotEvent; diff --git a/src/main/java/top/focess/qq/api/event/recall/GroupRecallEvent.java b/src/main/java/top/focess/qq/api/event/recall/GroupRecallEvent.java index 9070acf..114bbdb 100644 --- a/src/main/java/top/focess/qq/api/event/recall/GroupRecallEvent.java +++ b/src/main/java/top/focess/qq/api/event/recall/GroupRecallEvent.java @@ -3,8 +3,8 @@ import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; import top.focess.qq.api.bot.Bot; -import top.focess.qq.api.bot.Group; -import top.focess.qq.api.bot.Member; +import top.focess.qq.api.bot.contact.Group; +import top.focess.qq.api.bot.contact.Member; import top.focess.qq.api.event.ListenerHandler; import top.focess.qq.api.event.bot.BotEvent; diff --git a/src/main/java/top/focess/qq/api/event/request/FriendRequestEvent.java b/src/main/java/top/focess/qq/api/event/request/FriendRequestEvent.java index 952b39c..ea95b76 100644 --- a/src/main/java/top/focess/qq/api/event/request/FriendRequestEvent.java +++ b/src/main/java/top/focess/qq/api/event/request/FriendRequestEvent.java @@ -3,7 +3,7 @@ import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; import top.focess.qq.api.bot.Bot; -import top.focess.qq.api.bot.Group; +import top.focess.qq.api.bot.contact.Group; import top.focess.qq.api.event.ListenerHandler; import top.focess.qq.api.event.bot.BotEvent; diff --git a/src/main/java/top/focess/qq/api/event/request/GroupRequestEvent.java b/src/main/java/top/focess/qq/api/event/request/GroupRequestEvent.java index 38edb0b..1024912 100644 --- a/src/main/java/top/focess/qq/api/event/request/GroupRequestEvent.java +++ b/src/main/java/top/focess/qq/api/event/request/GroupRequestEvent.java @@ -2,7 +2,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; import top.focess.qq.api.bot.Bot; -import top.focess.qq.api.bot.Friend; +import top.focess.qq.api.bot.contact.Friend; import top.focess.qq.api.event.ListenerHandler; import top.focess.qq.api.event.bot.BotEvent; diff --git a/src/main/java/top/focess/qq/core/bot/SimpleBot.java b/src/main/java/top/focess/qq/core/bot/SimpleBot.java index 26e259a..d829c20 100644 --- a/src/main/java/top/focess/qq/core/bot/SimpleBot.java +++ b/src/main/java/top/focess/qq/core/bot/SimpleBot.java @@ -6,8 +6,8 @@ import top.focess.qq.FocessQQ; import top.focess.qq.api.bot.Bot; import top.focess.qq.api.bot.BotLoginException; -import top.focess.qq.api.bot.Friend; -import top.focess.qq.api.bot.Group; +import top.focess.qq.api.bot.contact.Friend; +import top.focess.qq.api.bot.contact.Group; import top.focess.qq.api.plugin.Plugin; import top.focess.qq.core.bot.contact.SimpleFriend; import top.focess.qq.core.bot.contact.SimpleGroup; diff --git a/src/main/java/top/focess/qq/core/bot/contact/SimpleContact.java b/src/main/java/top/focess/qq/core/bot/contact/SimpleContact.java index 0acad39..6bff646 100644 --- a/src/main/java/top/focess/qq/core/bot/contact/SimpleContact.java +++ b/src/main/java/top/focess/qq/core/bot/contact/SimpleContact.java @@ -3,7 +3,7 @@ import net.mamoe.mirai.contact.*; import org.jetbrains.annotations.Nullable; import top.focess.qq.api.bot.Bot; -import top.focess.qq.api.bot.Contact; +import top.focess.qq.api.bot.contact.Contact; public abstract class SimpleContact implements Contact { diff --git a/src/main/java/top/focess/qq/core/bot/contact/SimpleFriend.java b/src/main/java/top/focess/qq/core/bot/contact/SimpleFriend.java index 3c6201a..665ded2 100644 --- a/src/main/java/top/focess/qq/core/bot/contact/SimpleFriend.java +++ b/src/main/java/top/focess/qq/core/bot/contact/SimpleFriend.java @@ -4,7 +4,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import top.focess.qq.api.bot.Bot; -import top.focess.qq.api.bot.Friend; +import top.focess.qq.api.bot.contact.Friend; import java.util.Map; diff --git a/src/main/java/top/focess/qq/core/bot/contact/SimpleGroup.java b/src/main/java/top/focess/qq/core/bot/contact/SimpleGroup.java index 67c9f29..5f58e0c 100644 --- a/src/main/java/top/focess/qq/core/bot/contact/SimpleGroup.java +++ b/src/main/java/top/focess/qq/core/bot/contact/SimpleGroup.java @@ -4,8 +4,8 @@ import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.Nullable; import top.focess.qq.api.bot.Bot; -import top.focess.qq.api.bot.Group; -import top.focess.qq.api.bot.Member; +import top.focess.qq.api.bot.contact.Group; +import top.focess.qq.api.bot.contact.Member; import java.util.List; import java.util.Map; diff --git a/src/main/java/top/focess/qq/core/bot/contact/SimpleMember.java b/src/main/java/top/focess/qq/core/bot/contact/SimpleMember.java index 6e62b13..847ca4e 100644 --- a/src/main/java/top/focess/qq/core/bot/contact/SimpleMember.java +++ b/src/main/java/top/focess/qq/core/bot/contact/SimpleMember.java @@ -4,8 +4,8 @@ import net.mamoe.mirai.contact.MemberPermission; import org.jetbrains.annotations.Nullable; import top.focess.qq.api.bot.Bot; -import top.focess.qq.api.bot.Group; -import top.focess.qq.api.bot.Member; +import top.focess.qq.api.bot.contact.Group; +import top.focess.qq.api.bot.contact.Member; import top.focess.qq.api.command.CommandPermission; import java.util.Map; diff --git a/src/main/java/top/focess/qq/core/bot/contact/SimpleOtherClient.java b/src/main/java/top/focess/qq/core/bot/contact/SimpleOtherClient.java index 577c8fe..99b81dd 100644 --- a/src/main/java/top/focess/qq/core/bot/contact/SimpleOtherClient.java +++ b/src/main/java/top/focess/qq/core/bot/contact/SimpleOtherClient.java @@ -3,7 +3,7 @@ import com.google.common.collect.Maps; import org.jetbrains.annotations.Nullable; import top.focess.qq.api.bot.Bot; -import top.focess.qq.api.bot.OtherClient; +import top.focess.qq.api.bot.contact.OtherClient; import java.util.Map; diff --git a/src/main/java/top/focess/qq/core/bot/contact/SimpleSpeaker.java b/src/main/java/top/focess/qq/core/bot/contact/SimpleSpeaker.java index 808d198..dbfc887 100644 --- a/src/main/java/top/focess/qq/core/bot/contact/SimpleSpeaker.java +++ b/src/main/java/top/focess/qq/core/bot/contact/SimpleSpeaker.java @@ -2,7 +2,7 @@ import net.mamoe.mirai.contact.AudioSupported; import top.focess.qq.api.bot.Bot; -import top.focess.qq.api.bot.Speaker; +import top.focess.qq.api.bot.contact.Speaker; public abstract class SimpleSpeaker extends SimpleTransmitter implements Speaker { diff --git a/src/main/java/top/focess/qq/core/bot/contact/SimpleStranger.java b/src/main/java/top/focess/qq/core/bot/contact/SimpleStranger.java index 343b015..8b50e0c 100644 --- a/src/main/java/top/focess/qq/core/bot/contact/SimpleStranger.java +++ b/src/main/java/top/focess/qq/core/bot/contact/SimpleStranger.java @@ -3,7 +3,7 @@ import com.google.common.collect.Maps; import org.jetbrains.annotations.Nullable; import top.focess.qq.api.bot.Bot; -import top.focess.qq.api.bot.Stranger; +import top.focess.qq.api.bot.contact.Stranger; import java.util.Map; diff --git a/src/main/java/top/focess/qq/core/bot/contact/SimpleTransmitter.java b/src/main/java/top/focess/qq/core/bot/contact/SimpleTransmitter.java index 2e7d2e5..23db202 100644 --- a/src/main/java/top/focess/qq/core/bot/contact/SimpleTransmitter.java +++ b/src/main/java/top/focess/qq/core/bot/contact/SimpleTransmitter.java @@ -4,7 +4,7 @@ import net.mamoe.mirai.message.data.Image; import net.mamoe.mirai.utils.ExternalResource; import top.focess.qq.api.bot.Bot; -import top.focess.qq.api.bot.Transmitter; +import top.focess.qq.api.bot.contact.Transmitter; import top.focess.qq.api.bot.message.Message; public abstract class SimpleTransmitter extends SimpleContact implements Transmitter { diff --git a/src/main/java/top/focess/qq/core/commands/FriendCommand.java b/src/main/java/top/focess/qq/core/commands/FriendCommand.java index c2e4a76..ca7bc57 100644 --- a/src/main/java/top/focess/qq/core/commands/FriendCommand.java +++ b/src/main/java/top/focess/qq/core/commands/FriendCommand.java @@ -5,7 +5,7 @@ import org.jetbrains.annotations.NotNull; import top.focess.qq.FocessQQ; import top.focess.qq.api.bot.Bot; -import top.focess.qq.api.bot.Friend; +import top.focess.qq.api.bot.contact.Friend; import top.focess.qq.api.bot.message.Message; import top.focess.qq.api.command.Command; import top.focess.qq.api.command.CommandArgument; diff --git a/src/main/java/top/focess/qq/core/commands/GroupCommand.java b/src/main/java/top/focess/qq/core/commands/GroupCommand.java index e3cd0e8..24e5be3 100644 --- a/src/main/java/top/focess/qq/core/commands/GroupCommand.java +++ b/src/main/java/top/focess/qq/core/commands/GroupCommand.java @@ -5,7 +5,7 @@ import org.jetbrains.annotations.NotNull; import top.focess.qq.FocessQQ; import top.focess.qq.api.bot.Bot; -import top.focess.qq.api.bot.Group; +import top.focess.qq.api.bot.contact.Group; import top.focess.qq.api.bot.message.Message; import top.focess.qq.api.command.Command; import top.focess.qq.api.command.CommandArgument;