Rewritten in kotlin

This commit is contained in:
Him188 2019-09-30 00:19:01 +08:00
parent 9e3b0661da
commit 3119a83c09
17 changed files with 60 additions and 199 deletions

View File

@ -1,24 +0,0 @@
package net.mamoe.mirai.event.events.bot;
import net.mamoe.mirai.Bot;
import net.mamoe.mirai.event.MiraiEvent;
import org.jetbrains.annotations.NotNull;
import java.util.Objects;
/**
* @author Him188moe
*/
public abstract class BotEvent extends MiraiEvent {
public final Bot bot;
public BotEvent(@NotNull Bot bot) {
this.bot = Objects.requireNonNull(bot);
}
@NotNull
public Bot getBot() {
return bot;
}
}

View File

@ -0,0 +1,11 @@
package net.mamoe.mirai.event.events.bot
import net.mamoe.mirai.Bot
import net.mamoe.mirai.event.MiraiEvent
/**
* @author Him188moe
*/
abstract class BotEvent(val bot: Bot) : MiraiEvent()
class BotLoginSucceedEvent(bot: Bot) : BotEvent(bot)

View File

@ -1,13 +0,0 @@
package net.mamoe.mirai.event.events.bot;
import net.mamoe.mirai.Bot;
/**
* @author NaturalHG
*/
public final class BotLoginSucceedEvent extends BotEvent {
public BotLoginSucceedEvent(Bot bot) {
super(bot);
}
}

View File

@ -1,23 +0,0 @@
package net.mamoe.mirai.event.events.group;
import net.mamoe.mirai.Bot;
import net.mamoe.mirai.contact.Group;
import net.mamoe.mirai.event.events.bot.BotEvent;
import org.jetbrains.annotations.NotNull;
/**
* @author Him188moe
*/
public abstract class GroupEvent extends BotEvent {
private final Group group;
public GroupEvent(Bot bot, Group group) {
super(bot);
this.group = group;
}
@NotNull
public Group getGroup() {
return group;
}
}

View File

@ -0,0 +1,10 @@
package net.mamoe.mirai.event.events.group
import net.mamoe.mirai.Bot
import net.mamoe.mirai.contact.Group
import net.mamoe.mirai.event.events.bot.BotEvent
/**
* @author Him188moe
*/
abstract class GroupEvent(bot: Bot, val group: Group) : BotEvent(bot)

View File

@ -1,17 +0,0 @@
package net.mamoe.mirai.event.events.network;
import net.mamoe.mirai.Bot;
import net.mamoe.mirai.event.Cancellable;
import net.mamoe.mirai.network.packet.ClientPacket;
import org.jetbrains.annotations.NotNull;
/**
* Packet 已经 encoded, 即将被发送
*
* @author Him188moe
*/
public final class BeforePacketSendEvent extends ClientPacketEvent implements Cancellable {
public BeforePacketSendEvent(@NotNull Bot bot, @NotNull ClientPacket packet) {
super(bot, packet);
}
}

View File

@ -1,19 +0,0 @@
package net.mamoe.mirai.event.events.network;
import net.mamoe.mirai.Bot;
import net.mamoe.mirai.network.packet.ClientPacket;
import org.jetbrains.annotations.NotNull;
/**
* @author Him188moe
*/
public abstract class ClientPacketEvent extends PacketEvent {
public ClientPacketEvent(@NotNull Bot bot, @NotNull ClientPacket packet) {
super(bot, packet);
}
@Override
public ClientPacket getPacket() {
return (ClientPacket) super.getPacket();
}
}

View File

@ -0,0 +1,10 @@
package net.mamoe.mirai.event.events.network
import net.mamoe.mirai.Bot
import net.mamoe.mirai.network.packet.ClientPacket
abstract class ClientPacketEvent<out P : ClientPacket>(bot: Bot, packet: P) : PacketEvent<P>(bot, packet)
class PacketSentEvent(bot: Bot, packet: ClientPacket) : ClientPacketEvent<ClientPacket>(bot, packet)
class BeforePacketSendEvent(bot: Bot, packet: ClientPacket) : ClientPacketEvent<ClientPacket>(bot, packet)

View File

@ -1,24 +0,0 @@
package net.mamoe.mirai.event.events.network;
import net.mamoe.mirai.Bot;
import net.mamoe.mirai.event.events.bot.BotEvent;
import net.mamoe.mirai.network.packet.Packet;
import org.jetbrains.annotations.NotNull;
import java.util.Objects;
/**
* @author Him188moe
*/
public abstract class PacketEvent extends BotEvent {
private final Packet packet;
public PacketEvent(@NotNull Bot bot, @NotNull Packet packet) {
super(bot);
this.packet = Objects.requireNonNull(packet);
}
public Packet getPacket() {
return packet;
}
}

View File

@ -0,0 +1,10 @@
package net.mamoe.mirai.event.events.network
import net.mamoe.mirai.Bot
import net.mamoe.mirai.event.events.bot.BotEvent
import net.mamoe.mirai.network.packet.Packet
/**
* @author Him188moe
*/
abstract class PacketEvent<out P : Packet>(bot: Bot, open val packet: P) : BotEvent(bot)

View File

@ -1,16 +0,0 @@
package net.mamoe.mirai.event.events.network;
import net.mamoe.mirai.Bot;
import net.mamoe.mirai.network.packet.ClientPacket;
import org.jetbrains.annotations.NotNull;
/**
* Packet 已经发出
*
* @author Him188moe
*/
public final class PacketSentEvent extends ClientPacketEvent {
public PacketSentEvent(@NotNull Bot bot, @NotNull ClientPacket packet) {
super(bot, packet);
}
}

View File

@ -1,18 +0,0 @@
package net.mamoe.mirai.event.events.network;
import net.mamoe.mirai.Bot;
import net.mamoe.mirai.network.packet.ServerPacket;
/**
* @author Him188moe
*/
public abstract class ServerPacketEvent extends PacketEvent {
public ServerPacketEvent(Bot bot, ServerPacket packet) {
super(bot, packet);
}
@Override
public ServerPacket getPacket() {
return (ServerPacket) super.getPacket();
}
}

View File

@ -0,0 +1,9 @@
package net.mamoe.mirai.event.events.network
import net.mamoe.mirai.Bot
import net.mamoe.mirai.network.packet.ServerPacket
abstract class ServerPacketEvent<out P : ServerPacket>(bot: Bot, packet: P) : PacketEvent<P>(bot, packet)
class ServerPacketReceivedEvent(bot: Bot, packet: ServerPacket) : ServerPacketEvent<ServerPacket>(bot, packet)

View File

@ -1,18 +0,0 @@
package net.mamoe.mirai.event.events.network;
import net.mamoe.mirai.Bot;
import net.mamoe.mirai.event.Cancellable;
import net.mamoe.mirai.network.packet.ServerCatchaPacket;
import net.mamoe.mirai.network.packet.ServerPacket;
/**
* 服务器接到某数据包时触发这个事件.
* 注意, 当接收到数据包的加密包( {@link ServerCatchaPacket.Encrypted})也会触发这个事件, 随后才会
*
* @author Him188moe
*/
public final class ServerPacketReceivedEvent extends ServerPacketEvent implements Cancellable {
public ServerPacketReceivedEvent(Bot bot, ServerPacket packet) {
super(bot, packet);
}
}

View File

@ -1,25 +0,0 @@
package net.mamoe.mirai.event.events.qq;
import net.mamoe.mirai.Bot;
import net.mamoe.mirai.contact.QQ;
import net.mamoe.mirai.event.events.bot.BotEvent;
import org.jetbrains.annotations.NotNull;
import java.util.Objects;
/**
* @author Him188moe
*/
public abstract class FriendEvent extends BotEvent {
public final QQ sender;
public FriendEvent(@NotNull Bot bot, @NotNull QQ sender) {
super(bot);
this.sender = Objects.requireNonNull(sender);
}
@NotNull
public QQ getSender() {
return sender;
}
}

View File

@ -0,0 +1,10 @@
package net.mamoe.mirai.event.events.qq
import net.mamoe.mirai.Bot
import net.mamoe.mirai.contact.QQ
import net.mamoe.mirai.event.events.bot.BotEvent
/**
* @author Him188moe
*/
abstract class FriendEvent(bot: Bot, val sender: QQ) : BotEvent(bot)

View File

@ -1,7 +1,5 @@
@file:Suppress("EXPERIMENTAL_API_USAGE")
//to simplify code
package net.mamoe.mirai.network.packet
import net.mamoe.mirai.Bot