Skip to content

Commit

Permalink
modify: rename package
Browse files Browse the repository at this point in the history
  • Loading branch information
@MidCoard
MidCoard committed Mar 24, 2022
1 parent 8abcea3 commit 8d1ddc9
Show file tree
Hide file tree
Showing 35 changed files with 47 additions and 41 deletions.
2 changes: 2 additions & 0 deletions src/main/java/top/focess/qq/FocessQQ.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/top/focess/qq/api/bot/Bot.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 3 additions & 1 deletion ...n/java/top/focess/qq/api/bot/Contact.java → ...op/focess/qq/api/bot/contact/Contact.java
View file
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion ...in/java/top/focess/qq/api/bot/Friend.java → ...top/focess/qq/api/bot/contact/Friend.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package top.focess.qq.api.bot;
package top.focess.qq.api.bot.contact;

import org.jetbrains.annotations.NotNull;

Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/top/focess/qq/api/bot/Group.java → .../top/focess/qq/api/bot/contact/Group.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package top.focess.qq.api.bot;
package top.focess.qq.api.bot.contact;

import org.checkerframework.checker.nullness.qual.NonNull;

Expand Down
2 changes: 1 addition & 1 deletion ...in/java/top/focess/qq/api/bot/Member.java → ...top/focess/qq/api/bot/contact/Member.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package top.focess.qq.api.bot;
package top.focess.qq.api.bot.contact;

import top.focess.qq.api.command.CommandPermission;

Expand Down
2 changes: 1 addition & 1 deletion ...va/top/focess/qq/api/bot/OtherClient.java → ...ocess/qq/api/bot/contact/OtherClient.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package top.focess.qq.api.bot;
package top.focess.qq.api.bot.contact;

public interface OtherClient extends Contact{

Expand Down
2 changes: 1 addition & 1 deletion ...n/java/top/focess/qq/api/bot/Speaker.java → ...op/focess/qq/api/bot/contact/Speaker.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package top.focess.qq.api.bot;
package top.focess.qq.api.bot.contact;

public interface Speaker extends Transmitter{

Expand Down
2 changes: 1 addition & 1 deletion .../java/top/focess/qq/api/bot/Stranger.java → ...p/focess/qq/api/bot/contact/Stranger.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package top.focess.qq.api.bot;
package top.focess.qq.api.bot.contact;

public interface Stranger extends Transmitter {

Expand Down
2 changes: 1 addition & 1 deletion ...va/top/focess/qq/api/bot/Transmitter.java → ...ocess/qq/api/bot/contact/Transmitter.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/top/focess/qq/api/command/CommandSender.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/top/focess/qq/api/event/bot/BotPreSendMessageEvent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/top/focess/qq/api/event/bot/BotSendMessageEvent.java
View file
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/top/focess/qq/api/event/bot/FriendInputStatusEvent.java
View file
Original file line number Diff line number Diff line change
@@ -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;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/top/focess/qq/api/event/chat/FriendChatEvent.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/top/focess/qq/api/event/chat/GroupChatEvent.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/top/focess/qq/api/event/chat/StrangerChatEvent.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/top/focess/qq/api/event/message/FriendMessageEvent.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/top/focess/qq/api/event/message/GroupMessageEvent.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/top/focess/qq/api/event/message/StrangerMessageEvent.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/top/focess/qq/api/event/recall/FriendRecallEvent.java
View file
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/top/focess/qq/api/event/recall/GroupRecallEvent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/top/focess/qq/api/event/request/FriendRequestEvent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/top/focess/qq/api/event/request/GroupRequestEvent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/top/focess/qq/core/bot/SimpleBot.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/top/focess/qq/core/bot/contact/SimpleContact.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/top/focess/qq/core/bot/contact/SimpleFriend.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/top/focess/qq/core/bot/contact/SimpleGroup.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/top/focess/qq/core/bot/contact/SimpleMember.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/top/focess/qq/core/bot/contact/SimpleOtherClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/top/focess/qq/core/bot/contact/SimpleSpeaker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/top/focess/qq/core/bot/contact/SimpleStranger.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/top/focess/qq/core/bot/contact/SimpleTransmitter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/top/focess/qq/core/commands/FriendCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/top/focess/qq/core/commands/GroupCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 8d1ddc9

Please sign in to comment.