Rewritten in kotlin

mirai-core/src/main/java/net/mamoe/mirai/event/events/bot/BotEvent.java

-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;
-    }
-
-}

mirai-core/src/main/java/net/mamoe/mirai/event/events/bot/BotEvent.kt

+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)
\ No newline at end of file

mirai-core/src/main/java/net/mamoe/mirai/event/events/bot/BotLoginSucceedEvent.java

-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);
-    }
-}

mirai-core/src/main/java/net/mamoe/mirai/event/events/group/GroupEvent.java

-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;
-    }
-}

mirai-core/src/main/java/net/mamoe/mirai/event/events/group/GroupEvent.kt

+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)
\ No newline at end of file

mirai-core/src/main/java/net/mamoe/mirai/event/events/network/BeforePacketSendEvent.java

-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);
-    }
-}

mirai-core/src/main/java/net/mamoe/mirai/event/events/network/ClientPacketEvent.java

-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();
-    }
-}

mirai-core/src/main/java/net/mamoe/mirai/event/events/network/ClientPacketEvents.kt

+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)
\ No newline at end of file

mirai-core/src/main/java/net/mamoe/mirai/event/events/network/PacketEvent.java

-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;
-    }
-}

mirai-core/src/main/java/net/mamoe/mirai/event/events/network/PacketEvent.kt

+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)

mirai-core/src/main/java/net/mamoe/mirai/event/events/network/PacketSentEvent.java

-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);
-    }
-}

mirai-core/src/main/java/net/mamoe/mirai/event/events/network/ServerPacketEvent.java

-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();
-    }
-}

mirai-core/src/main/java/net/mamoe/mirai/event/events/network/ServerPacketEvents.kt

+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)
\ No newline at end of file

mirai-core/src/main/java/net/mamoe/mirai/event/events/network/ServerPacketReceivedEvent.java

-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);
-    }
-}

mirai-core/src/main/java/net/mamoe/mirai/event/events/qq/FriendEvent.java

-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;
-    }
-}

mirai-core/src/main/java/net/mamoe/mirai/event/events/qq/FriendEvent.kt

+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)
\ No newline at end of file

mirai-core/src/main/java/net/mamoe/mirai/network/packet/ServerPacket.kt

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