feat: 添加了连接已启用的事件

2022-10-28 02:12:45 +08:00
parent cfe5648a69
commit 02f613071f
34 changed files with 248 additions and 318 deletions
--- a/hamster-ball-common/build.gradle
+++ b/hamster-ball-common/build.gradle
@@ -1,4 +1,3 @@
-version = '1.0.0'
 setArchivesBaseName("HamsterBall-Common")

 dependencies {
--- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java
+++ b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java
@@ -3,11 +3,11 @@ package cn.hamster3.mc.plugin.ball.common.api;
 import cn.hamster3.mc.plugin.ball.common.config.BallConfig;
 import cn.hamster3.mc.plugin.ball.common.connector.BallChannelInitializer;
 import cn.hamster3.mc.plugin.ball.common.constant.BallCommonConstants;
-import cn.hamster3.mc.plugin.ball.common.data.MessageInfo;
-import cn.hamster3.mc.plugin.ball.common.data.ServiceLocation;
-import cn.hamster3.mc.plugin.ball.common.entity.PlayerInfo;
-import cn.hamster3.mc.plugin.ball.common.entity.ServerInfo;
-import cn.hamster3.mc.plugin.ball.common.entity.ServerType;
+import cn.hamster3.mc.plugin.ball.common.data.BallLocation;
+import cn.hamster3.mc.plugin.ball.common.data.BallMessageInfo;
+import cn.hamster3.mc.plugin.ball.common.entity.BallPlayerInfo;
+import cn.hamster3.mc.plugin.ball.common.entity.BallServerInfo;
+import cn.hamster3.mc.plugin.ball.common.entity.BallServerType;
 import cn.hamster3.mc.plugin.ball.common.event.operate.*;
 import cn.hamster3.mc.plugin.ball.common.event.player.*;
 import cn.hamster3.mc.plugin.ball.common.event.server.ServerOfflineEvent;
@@ -34,6 +34,7 @@ import java.sql.*;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;

+@SuppressWarnings("unused")
 public abstract class BallAPI {
    /**
     * API 使用的通信频道
@@ -44,9 +45,9 @@ public abstract class BallAPI {
     */
    protected static BallAPI instance;
    @NotNull
-    protected final ConcurrentHashMap<String, ServerInfo> serverInfo;
+    protected final ConcurrentHashMap<String, BallServerInfo> serverInfo;
    @NotNull
-    protected final ConcurrentHashMap<UUID, PlayerInfo> playerInfo;
+    protected final ConcurrentHashMap<UUID, BallPlayerInfo> playerInfo;

    @NotNull
    private final BallConfig config;
@@ -82,37 +83,37 @@ public abstract class BallAPI {

            @Override
            public void onBallPlayerConnectServer(@NotNull BallPlayerConnectServerEvent event) {
-                PlayerInfo info = event.getPlayerInfo();
+                BallPlayerInfo info = event.getPlayerInfo();
                playerInfo.put(info.getUuid(), info);
            }

            @Override
            public void onBallPlayerLogout(@NotNull BallPlayerLogoutEvent event) {
-                PlayerInfo info = event.getPlayerInfo();
+                BallPlayerInfo info = event.getPlayerInfo();
                playerInfo.put(info.getUuid(), info);
            }

            @Override
            public void onBallPlayerLogin(@NotNull BallPlayerLoginEvent event) {
-                PlayerInfo info = event.getPlayerInfo();
+                BallPlayerInfo info = event.getPlayerInfo();
                playerInfo.put(info.getUuid(), info);
            }

            @Override
            public void onBallPlayerPostConnectServer(@NotNull BallPlayerPostConnectServerEvent event) {
-                PlayerInfo info = event.getPlayerInfo();
+                BallPlayerInfo info = event.getPlayerInfo();
                playerInfo.put(info.getUuid(), info);
            }

            @Override
            public void onBallPlayerPostLogin(@NotNull BallPlayerPostLoginEvent event) {
-                PlayerInfo info = event.getPlayerInfo();
+                BallPlayerInfo info = event.getPlayerInfo();
                playerInfo.put(info.getUuid(), info);
            }

            @Override
            public void onBallPlayerPreConnectServer(@NotNull BallPlayerPreConnectServerEvent event) {
-                PlayerInfo info = event.getPlayerInfo();
+                BallPlayerInfo info = event.getPlayerInfo();
                playerInfo.put(info.getUuid(), info);
            }

@@ -124,7 +125,7 @@ public abstract class BallAPI {

            @Override
            public void onServerOnline(@NotNull ServerOnlineEvent event) {
-                ServerInfo info = event.getServerInfo();
+                BallServerInfo info = event.getServerInfo();
                serverInfo.put(info.getId(), info);
            }

@@ -149,7 +150,7 @@ public abstract class BallAPI {
            return;
        }
        enable = true;
-        ServerInfo localInfo = getLocalServerInfo();
+        BallServerInfo localInfo = getLocalServerInfo();

        connect();

@@ -194,10 +195,10 @@ public abstract class BallAPI {
                ResultSet set = statement.executeQuery();
                while (set.next()) {
                    String serverID = set.getString("id");
-                    serverInfo.put(serverID, new ServerInfo(
+                    serverInfo.put(serverID, new BallServerInfo(
                            serverID,
                            set.getString("name"),
-                            ServerType.valueOf(set.getString("type")),
+                            BallServerType.valueOf(set.getString("type")),
                            set.getString("host"),
                            set.getInt("port")
                    ));
@@ -211,7 +212,7 @@ public abstract class BallAPI {
                ResultSet set = statement.executeQuery();
                while (set.next()) {
                    UUID uuid = UUID.fromString(set.getString("uuid"));
-                    playerInfo.put(uuid, new PlayerInfo(uuid,
+                    playerInfo.put(uuid, new BallPlayerInfo(uuid,
                            set.getString("name"),
                            set.getString("game_server"),
                            set.getString("proxy_server"),
@@ -238,6 +239,9 @@ public abstract class BallAPI {
        ChannelFuture future = bootstrap.connect(config.getHost(), config.getPort()).await();
        if (future.isSuccess()) {
            channel = future.channel();
+            for (BallListener listener : listeners) {
+                listener.onConnectActive();
+            }
        }
    }

@@ -299,7 +303,7 @@ public abstract class BallAPI {
     * @param info 服务器信息
     * @return true 代表该服务器信息是本服服务器
     */
-    public boolean isLocalServer(@NotNull ServerInfo info) {
+    public boolean isLocalServer(@NotNull BallServerInfo info) {
        return getLocalServerInfo().equals(info);
    }

@@ -330,7 +334,7 @@ public abstract class BallAPI {
    public void broadcastPlayerMessage(@NotNull Message message) {
        sendBallMessage(
                BALL_CHANNEL,
-                ServerType.PROXY,
+                BallServerType.PROXY,
                BroadcastPlayerMessageEvent.ACTION,
                new BroadcastPlayerMessageEvent(message)
        );
@@ -343,10 +347,10 @@ public abstract class BallAPI {
     * @param serverID 执行对象的 ID
     * @param command  命令内容
     */
-    public void dispatchConsoleCommand(@Nullable ServerType type, @Nullable String serverID, @NotNull String command) {
+    public void dispatchConsoleCommand(@Nullable BallServerType type, @Nullable String serverID, @NotNull String command) {
        sendBallMessage(
                BALL_CHANNEL,
-                ServerType.GAME,
+                BallServerType.GAME,
                DispatchConsoleCommandEvent.ACTION,
                new DispatchConsoleCommandEvent(type, serverID, command)

@@ -360,10 +364,10 @@ public abstract class BallAPI {
     * @param uuid    执行对象的 UUID
     * @param command 命令内容
     */
-    public void dispatchPlayerCommand(@Nullable ServerType type, @Nullable UUID uuid, @NotNull String command) {
+    public void dispatchPlayerCommand(@Nullable BallServerType type, @Nullable UUID uuid, @NotNull String command) {
        sendBallMessage(
                BALL_CHANNEL,
-                ServerType.GAME,
+                BallServerType.GAME,
                DispatchPlayerCommandEvent.ACTION,
                new DispatchPlayerCommandEvent(type, uuid, command)

@@ -389,7 +393,7 @@ public abstract class BallAPI {
    public void kickPlayer(@NotNull UUID uuid, @NotNull Component reason) {
        sendBallMessage(
                BALL_CHANNEL,
-                ServerType.PROXY,
+                BallServerType.PROXY,
                KickPlayerEvent.ACTION,
                new KickPlayerEvent(uuid, reason)

@@ -404,7 +408,7 @@ public abstract class BallAPI {
     * @param cache   当玩家不在线时，是否缓存消息等待玩家上线再发送
     */
    public void sendMessageToPlayer(@NotNull UUID uuid, @NotNull Message message, boolean cache) {
-        PlayerInfo info = getPlayerInfo(uuid);
+        BallPlayerInfo info = getPlayerInfo(uuid);
        if (info == null || !info.isOnline()) {
            if (!cache) {
                return;
@@ -422,7 +426,7 @@ public abstract class BallAPI {
        }
        sendBallMessage(
                BALL_CHANNEL,
-                ServerType.PROXY,
+                BallServerType.PROXY,
                SendMessageToPlayerEvent.ACTION,
                new SendMessageToPlayerEvent(Collections.singleton(uuid), message)

@@ -438,7 +442,7 @@ public abstract class BallAPI {
     */
    public void sendMessageToPlayer(@NotNull Set<UUID> receiver, @NotNull Message message, boolean cache) {
        for (UUID uuid : receiver) {
-            PlayerInfo info = getPlayerInfo(uuid);
+            BallPlayerInfo info = getPlayerInfo(uuid);
            if (info == null || !info.isOnline()) {
                if (!cache) {
                    return;
@@ -457,7 +461,7 @@ public abstract class BallAPI {
        }
        sendBallMessage(
                BALL_CHANNEL,
-                ServerType.PROXY,
+                BallServerType.PROXY,
                SendMessageToPlayerEvent.ACTION,
                new SendMessageToPlayerEvent(receiver, message)
        );
@@ -475,7 +479,7 @@ public abstract class BallAPI {
     * @param location       坐标
     * @param doneMessage    传送完成后显示的消息
     */
-    public void sendPlayerToLocation(@NotNull UUID sendPlayerUUID, @NotNull ServiceLocation location, @Nullable Message doneMessage) {
+    public void sendPlayerToLocation(@NotNull UUID sendPlayerUUID, @NotNull BallLocation location, @Nullable Message doneMessage) {
        sendBallMessage(
                BALL_CHANNEL,
                SendPlayerToLocationEvent.ACTION,
@@ -494,7 +498,7 @@ public abstract class BallAPI {
     * @param location       坐标
     * @param doneMessage    传送完成后显示的消息
     */
-    public void sendPlayerToLocation(@NotNull HashSet<UUID> sendPlayerUUID, @NotNull ServiceLocation location, @Nullable Message doneMessage) {
+    public void sendPlayerToLocation(@NotNull HashSet<UUID> sendPlayerUUID, @NotNull BallLocation location, @Nullable Message doneMessage) {
        sendBallMessage(
                BALL_CHANNEL,
                SendPlayerToLocationEvent.ACTION,
@@ -542,7 +546,7 @@ public abstract class BallAPI {
     * @param action  执行动作
     */
    public void sendBallMessage(@NotNull String channel, @NotNull String action) {
-        sendBallMessage(new MessageInfo(channel, getLocalServerId(), null, null, action, null));
+        sendBallMessage(new BallMessageInfo(channel, getLocalServerId(), null, null, action, null));
    }

    /**
@@ -553,7 +557,7 @@ public abstract class BallAPI {
     * @param content 附加参数
     */
    public void sendBallMessage(@NotNull String channel, @NotNull String action, @NotNull String content) {
-        sendBallMessage(new MessageInfo(channel, getLocalServerId(), null, null, action, new JsonPrimitive(content)));
+        sendBallMessage(new BallMessageInfo(channel, getLocalServerId(), null, null, action, new JsonPrimitive(content)));
    }

    /**
@@ -564,7 +568,7 @@ public abstract class BallAPI {
     * @param content 附加参数
     */
    public void sendBallMessage(@NotNull String channel, @NotNull String action, @NotNull JsonElement content) {
-        sendBallMessage(new MessageInfo(channel, getLocalServerId(), null, null, action, content));
+        sendBallMessage(new BallMessageInfo(channel, getLocalServerId(), null, null, action, content));
    }

    /**
@@ -575,7 +579,7 @@ public abstract class BallAPI {
     * @param content 附加参数
     */
    public void sendBallMessage(@NotNull String channel, @NotNull String action, @NotNull Object content) {
-        sendBallMessage(new MessageInfo(channel, getLocalServerId(), null, null, action, CoreConstantObjects.GSON.toJsonTree(content)));
+        sendBallMessage(new BallMessageInfo(channel, getLocalServerId(), null, null, action, CoreConstantObjects.GSON.toJsonTree(content)));
    }

    /**
@@ -585,8 +589,8 @@ public abstract class BallAPI {
     * @param action  执行动作
     * @param content 附加参数
     */
-    public void sendBallMessage(@NotNull String channel, @Nullable ServerType receiverType, @NotNull String action, @NotNull JsonElement content) {
-        sendBallMessage(new MessageInfo(channel, getLocalServerId(), null, receiverType, action, content));
+    public void sendBallMessage(@NotNull String channel, @Nullable BallServerType receiverType, @NotNull String action, @NotNull JsonElement content) {
+        sendBallMessage(new BallMessageInfo(channel, getLocalServerId(), null, receiverType, action, content));
    }

    /**
@@ -596,8 +600,8 @@ public abstract class BallAPI {
     * @param action  执行动作
     * @param content 附加参数
     */
-    public void sendBallMessage(@NotNull String channel, @Nullable ServerType receiverType, @NotNull String action, @NotNull Object content) {
-        sendBallMessage(new MessageInfo(channel, getLocalServerId(), null, receiverType, action, CoreConstantObjects.GSON.toJsonTree(content)));
+    public void sendBallMessage(@NotNull String channel, @Nullable BallServerType receiverType, @NotNull String action, @NotNull Object content) {
+        sendBallMessage(new BallMessageInfo(channel, getLocalServerId(), null, receiverType, action, CoreConstantObjects.GSON.toJsonTree(content)));
    }

    /**
@@ -605,7 +609,7 @@ public abstract class BallAPI {
     *
     * @param messageInfo 消息内容
     */
-    public void sendBallMessage(@NotNull MessageInfo messageInfo) {
+    public void sendBallMessage(@NotNull BallMessageInfo messageInfo) {
        sendBallMessage(messageInfo, false);
    }

@@ -615,7 +619,7 @@ public abstract class BallAPI {
     * @param messageInfo 消息内容
     * @param block       是否阻塞（设置为 true 则必须等待消息写入网络的操作完成后，该方法才会退出）
     */
-    public void sendBallMessage(@NotNull MessageInfo messageInfo, boolean block) {
+    public void sendBallMessage(@NotNull BallMessageInfo messageInfo, boolean block) {
        if (channel == null || !channel.isWritable()) {
            return;
        }
@@ -676,7 +680,7 @@ public abstract class BallAPI {
     * @return 服务器ID
     */
    @NotNull
-    public ServerInfo getLocalServerInfo() {
+    public BallServerInfo getLocalServerInfo() {
        return config.getLocalInfo();
    }

@@ -691,7 +695,7 @@ public abstract class BallAPI {
     * @param serverID 服务器ID
     * @return 可能为 null
     */
-    public ServerInfo getServerInfo(@NotNull String serverID) {
+    public BallServerInfo getServerInfo(@NotNull String serverID) {
        return serverInfo.get(serverID);
    }

@@ -701,7 +705,7 @@ public abstract class BallAPI {
     * @param uuid 玩家的 UUID
     * @return 玩家信息
     */
-    public PlayerInfo getPlayerInfo(@NotNull UUID uuid) {
+    public BallPlayerInfo getPlayerInfo(@NotNull UUID uuid) {
        return playerInfo.get(uuid);
    }

@@ -711,7 +715,7 @@ public abstract class BallAPI {
     * @param playerName 玩家名称
     * @return 玩家信息
     */
-    public PlayerInfo getPlayerInfo(@NotNull String playerName) {
+    public BallPlayerInfo getPlayerInfo(@NotNull String playerName) {
        return playerInfo.searchValues(Long.MAX_VALUE, info -> {
            if (info.getName().equalsIgnoreCase(playerName)) {
                return info;
@@ -721,12 +725,12 @@ public abstract class BallAPI {
    }

    @NotNull
-    public ConcurrentHashMap<String, ServerInfo> getAllServerInfo() {
+    public ConcurrentHashMap<String, BallServerInfo> getAllServerInfo() {
        return serverInfo;
    }

    @NotNull
-    public ConcurrentHashMap<UUID, PlayerInfo> getAllPlayerInfo() {
+    public ConcurrentHashMap<UUID, BallPlayerInfo> getAllPlayerInfo() {
        return playerInfo;
    }

--- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/config/BallConfig.java
+++ b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/config/BallConfig.java
@@ -1,6 +1,6 @@
 package cn.hamster3.mc.plugin.ball.common.config;

-import cn.hamster3.mc.plugin.ball.common.entity.ServerInfo;
+import cn.hamster3.mc.plugin.ball.common.entity.BallServerInfo;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.jetbrains.annotations.NotNull;
@@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
@AllArgsConstructor
 public class BallConfig {
    @NotNull
-    private ServerInfo localInfo;
+    private BallServerInfo localInfo;

    @NotNull
    private String host;
--- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/connector/BallChannelInboundHandler.java
+++ b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/connector/BallChannelInboundHandler.java
@@ -1,8 +1,7 @@
 package cn.hamster3.mc.plugin.ball.common.connector;

 import cn.hamster3.mc.plugin.ball.common.api.BallAPI;
-import cn.hamster3.mc.plugin.ball.common.data.MessageInfo;
-import cn.hamster3.mc.plugin.ball.common.event.operate.*;
+import cn.hamster3.mc.plugin.ball.common.data.BallMessageInfo;
 import cn.hamster3.mc.plugin.ball.common.event.player.*;
 import cn.hamster3.mc.plugin.ball.common.event.server.ServerOfflineEvent;
 import cn.hamster3.mc.plugin.ball.common.event.server.ServerOnlineEvent;
@@ -20,7 +19,7 @@ public class BallChannelInboundHandler extends SimpleChannelInboundHandler<Strin

    @Override
    protected void channelRead0(ChannelHandlerContext context, String message) {
-        MessageInfo info = CoreConstantObjects.GSON.fromJson(message, MessageInfo.class);
+        BallMessageInfo info = CoreConstantObjects.GSON.fromJson(message, BallMessageInfo.class);
        for (BallListener listener : BallAPI.getInstance().getListeners()) {
            try {
                listener.onMessageReceived(info);
@@ -32,83 +31,6 @@ public class BallChannelInboundHandler extends SimpleChannelInboundHandler<Strin
            return;
        }
        switch (info.getAction()) {
-            case BroadcastPlayerMessageEvent.ACTION: {
-                BroadcastPlayerMessageEvent event = CoreConstantObjects.GSON.fromJson(info.getContent(), BroadcastPlayerMessageEvent.class);
-                for (BallListener listener : BallAPI.getInstance().getListeners()) {
-                    try {
-                        listener.onBroadcastPlayerMessage(event);
-                    } catch (Exception | Error e) {
-                        e.printStackTrace();
-                    }
-                }
-                break;
-            }
-            case DispatchConsoleCommandEvent.ACTION: {
-                DispatchConsoleCommandEvent event = CoreConstantObjects.GSON.fromJson(info.getContent(), DispatchConsoleCommandEvent.class);
-                for (BallListener listener : BallAPI.getInstance().getListeners()) {
-                    try {
-                        listener.onDispatchConsoleCommand(event);
-                    } catch (Exception | Error e) {
-                        e.printStackTrace();
-                    }
-                }
-                break;
-            }
-            case DispatchPlayerCommandEvent.ACTION: {
-                DispatchPlayerCommandEvent event = CoreConstantObjects.GSON.fromJson(info.getContent(), DispatchPlayerCommandEvent.class);
-                for (BallListener listener : BallAPI.getInstance().getListeners()) {
-                    try {
-                        listener.onDispatchPlayerCommand(event);
-                    } catch (Exception | Error e) {
-                        e.printStackTrace();
-                    }
-                }
-                break;
-            }
-            case KickPlayerEvent.ACTION: {
-                KickPlayerEvent event = CoreConstantObjects.GSON.fromJson(info.getContent(), KickPlayerEvent.class);
-                for (BallListener listener : BallAPI.getInstance().getListeners()) {
-                    try {
-                        listener.onKickPlayer(event);
-                    } catch (Exception | Error e) {
-                        e.printStackTrace();
-                    }
-                }
-                break;
-            }
-            case SendMessageToPlayerEvent.ACTION: {
-                SendMessageToPlayerEvent event = CoreConstantObjects.GSON.fromJson(info.getContent(), SendMessageToPlayerEvent.class);
-                for (BallListener listener : BallAPI.getInstance().getListeners()) {
-                    try {
-                        listener.onSendMessageToPlayer(event);
-                    } catch (Exception | Error e) {
-                        e.printStackTrace();
-                    }
-                }
-                break;
-            }
-            case SendPlayerToLocationEvent.ACTION: {
-                SendPlayerToLocationEvent event = CoreConstantObjects.GSON.fromJson(info.getContent(), SendPlayerToLocationEvent.class);
-                for (BallListener listener : BallAPI.getInstance().getListeners()) {
-                    try {
-                        listener.onSendPlayerToLocation(event);
-                    } catch (Exception | Error e) {
-                        e.printStackTrace();
-                    }
-                }
-                break;
-            }
-            case SendPlayerToPlayerEvent.ACTION: {
-                SendPlayerToPlayerEvent event = CoreConstantObjects.GSON.fromJson(info.getContent(), SendPlayerToPlayerEvent.class);
-                for (BallListener listener : BallAPI.getInstance().getListeners()) {
-                    try {
-                        listener.onSendPlayerToPlayer(event);
-                    } catch (Exception | Error e) {
-                        e.printStackTrace();
-                    }
-                }
-                break;
-            }
            case BallPlayerPreLoginEvent.ACTION: {
                BallPlayerPreLoginEvent event = CoreConstantObjects.GSON.fromJson(info.getContent(), BallPlayerPreLoginEvent.class);
                for (BallListener listener : BallAPI.getInstance().getListeners()) {
--- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/data/ServiceBlockPos.java
+++ b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/data/ServiceBlockPos.java
@@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
@NoArgsConstructor
@AllArgsConstructor
@SuppressWarnings("unused")
-public class ServiceBlockPos {
+public class BallBlockPos {
    private String serverID;
    private String worldName;
    private int x;
@@ -17,7 +17,7 @@ public class ServiceBlockPos {
    private int z;

    @NotNull
-    public ServiceLocation toServiceLocation() {
-        return new ServiceLocation(getServerID(), getWorldName(), getX(), getY(), getZ(), 0, 0);
+    public BallLocation toServiceLocation() {
+        return new BallLocation(getServerID(), getWorldName(), getX(), getY(), getZ(), 0, 0);
    }
 }
--- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/data/ServiceLocation.java
+++ b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/data/ServiceLocation.java
@@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
@NoArgsConstructor
@AllArgsConstructor
@SuppressWarnings("unused")
-public class ServiceLocation {
+public class BallLocation {
    private String serverID;
    private String worldName;
    private double x;
@@ -32,7 +32,7 @@ public class ServiceLocation {
    }

    @NotNull
-    public ServiceBlockPos toServiceBlockPos() {
-        return new ServiceBlockPos(getServerID(), getWorldName(), getBlockX(), getBlockY(), getBlockZ());
+    public BallBlockPos toServiceBlockPos() {
+        return new BallBlockPos(getServerID(), getWorldName(), getBlockX(), getBlockY(), getBlockZ());
    }
 }
--- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/data/BallMessageInfo.java
+++ b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/data/BallMessageInfo.java
@@ -1,6 +1,6 @@
 package cn.hamster3.mc.plugin.ball.common.data;

-import cn.hamster3.mc.plugin.ball.common.entity.ServerType;
+import cn.hamster3.mc.plugin.ball.common.entity.BallServerType;
 import cn.hamster3.mc.plugin.core.common.constant.CoreConstantObjects;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
@@ -22,7 +22,7 @@ import java.util.UUID;
@NoArgsConstructor
@AllArgsConstructor
@SuppressWarnings("unused")
-public class MessageInfo {
+public class BallMessageInfo {
    /**
     * 消息的频道
     */
@@ -50,7 +50,7 @@ public class MessageInfo {
     * 若不设定（值为null），则该消息会广播给所有子端
     */
    @Nullable
-    private ServerType receiverType;
+    private BallServerType receiverType;
    /**
     * 消息动作
     * <p>
--- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/entity/BallPlayerInfo.java
+++ b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/entity/BallPlayerInfo.java
@@ -12,7 +12,7 @@ import java.util.UUID;
@Data
@NotNull
@AllArgsConstructor
-public class PlayerInfo {
+public class BallPlayerInfo {
    /**
     * 玩家的uuid
     */
@@ -47,7 +47,7 @@ public class PlayerInfo {
        if (this == o) return true;
        if (o == null || getClass() != o.getClass()) return false;

-        PlayerInfo that = (PlayerInfo) o;
+        BallPlayerInfo that = (BallPlayerInfo) o;

        return uuid.equals(that.uuid);
    }
--- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/entity/BallServerInfo.java
+++ b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/entity/BallServerInfo.java
@@ -12,7 +12,7 @@ import java.util.Objects;
@Data
@NoArgsConstructor
@AllArgsConstructor
-public class ServerInfo {
+public class BallServerInfo {
    /**
     * 服务器 ID
     * <p>
@@ -28,7 +28,7 @@ public class ServerInfo {
    /**
     * 服务器类型
     */
-    private ServerType type;
+    private BallServerType type;
    /**
     * 服务器主机名
     * <p>
@@ -44,7 +44,7 @@ public class ServerInfo {
    public boolean equals(Object o) {
        if (this == o) return true;
        if (o == null || getClass() != o.getClass()) return false;
-        ServerInfo that = (ServerInfo) o;
+        BallServerInfo that = (BallServerInfo) o;
        return id.equals(that.id);
    }

--- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/entity/BallServerType.java
+++ b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/entity/BallServerType.java
@@ -4,7 +4,7 @@ package cn.hamster3.mc.plugin.ball.common.entity;
 * Service 接入者的类型
 */
@SuppressWarnings("unused")
-public enum ServerType {
+public enum BallServerType {
    /**
     * 游戏服务器
     */
--- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/DispatchConsoleCommandEvent.java
+++ b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/DispatchConsoleCommandEvent.java
@@ -1,6 +1,6 @@
 package cn.hamster3.mc.plugin.ball.common.event.operate;

-import cn.hamster3.mc.plugin.ball.common.entity.ServerType;
+import cn.hamster3.mc.plugin.ball.common.entity.BallServerType;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.jetbrains.annotations.NotNull;
@@ -12,7 +12,7 @@ public class DispatchConsoleCommandEvent {
    public static final String ACTION = "DispatchConsoleCommand";

    @Nullable
-    private final ServerType type;
+    private final BallServerType type;
    @Nullable
    private final String serverID;
    @NotNull
--- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/DispatchPlayerCommandEvent.java
+++ b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/DispatchPlayerCommandEvent.java
@@ -1,6 +1,6 @@
 package cn.hamster3.mc.plugin.ball.common.event.operate;

-import cn.hamster3.mc.plugin.ball.common.entity.ServerType;
+import cn.hamster3.mc.plugin.ball.common.entity.BallServerType;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.jetbrains.annotations.NotNull;
@@ -14,7 +14,7 @@ public class DispatchPlayerCommandEvent {
    public static final String ACTION = "DispatchPlayerCommand";

    @Nullable
-    private final ServerType type;
+    private final BallServerType type;
    @Nullable
    private final UUID uuid;
    @NotNull
--- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/SendPlayerToLocationEvent.java
+++ b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/SendPlayerToLocationEvent.java
@@ -1,6 +1,6 @@
 package cn.hamster3.mc.plugin.ball.common.event.operate;

-import cn.hamster3.mc.plugin.ball.common.data.ServiceLocation;
+import cn.hamster3.mc.plugin.ball.common.data.BallLocation;
 import cn.hamster3.mc.plugin.core.common.data.Message;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -18,7 +18,7 @@ public class SendPlayerToLocationEvent {
    @NotNull
    private final Set<UUID> sendPlayerUUID;
    @NotNull
-    private final ServiceLocation location;
+    private final BallLocation location;
    @Nullable
    private final Message doneMessage;

--- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerConnectServerEvent.java
+++ b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerConnectServerEvent.java
@@ -1,6 +1,6 @@
 package cn.hamster3.mc.plugin.ball.common.event.player;

-import cn.hamster3.mc.plugin.ball.common.entity.PlayerInfo;
+import cn.hamster3.mc.plugin.ball.common.entity.BallPlayerInfo;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.jetbrains.annotations.NotNull;
@@ -15,7 +15,7 @@ public class BallPlayerConnectServerEvent {
    public static final String ACTION = "PlayerConnectServer";

    @NotNull
-    private final PlayerInfo playerInfo;
+    private final BallPlayerInfo playerInfo;
    @Nullable
    private final String from;
    @NotNull
--- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerLoginEvent.java
+++ b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerLoginEvent.java
@@ -1,6 +1,6 @@
 package cn.hamster3.mc.plugin.ball.common.event.player;

-import cn.hamster3.mc.plugin.ball.common.entity.PlayerInfo;
+import cn.hamster3.mc.plugin.ball.common.entity.BallPlayerInfo;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.jetbrains.annotations.NotNull;
@@ -14,6 +14,6 @@ public class BallPlayerLoginEvent {
    public static final String ACTION = "PlayerLogin";

    @NotNull
-    private final PlayerInfo playerInfo;
+    private final BallPlayerInfo playerInfo;

 }
--- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerLogoutEvent.java
+++ b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerLogoutEvent.java
@@ -1,6 +1,6 @@
 package cn.hamster3.mc.plugin.ball.common.event.player;

-import cn.hamster3.mc.plugin.ball.common.entity.PlayerInfo;
+import cn.hamster3.mc.plugin.ball.common.entity.BallPlayerInfo;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.jetbrains.annotations.NotNull;
@@ -14,5 +14,5 @@ public class BallPlayerLogoutEvent {
    public static final String ACTION = "PlayerLogout";

    @NotNull
-    private PlayerInfo playerInfo;
+    private BallPlayerInfo playerInfo;
 }
--- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerPostConnectServerEvent.java
+++ b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerPostConnectServerEvent.java
@@ -1,6 +1,6 @@
 package cn.hamster3.mc.plugin.ball.common.event.player;

-import cn.hamster3.mc.plugin.ball.common.entity.PlayerInfo;
+import cn.hamster3.mc.plugin.ball.common.entity.BallPlayerInfo;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.jetbrains.annotations.NotNull;
@@ -14,5 +14,5 @@ public class BallPlayerPostConnectServerEvent {
    public static final String ACTION = "PlayerPostConnectServer";

    @NotNull
-    private final PlayerInfo playerInfo;
+    private final BallPlayerInfo playerInfo;
 }
--- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerPostLoginEvent.java
+++ b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerPostLoginEvent.java
@@ -1,6 +1,6 @@
 package cn.hamster3.mc.plugin.ball.common.event.player;

-import cn.hamster3.mc.plugin.ball.common.entity.PlayerInfo;
+import cn.hamster3.mc.plugin.ball.common.entity.BallPlayerInfo;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.jetbrains.annotations.NotNull;
@@ -14,5 +14,5 @@ public class BallPlayerPostLoginEvent {
    public static final String ACTION = "PlayerPostLogin";

    @NotNull
-    private final PlayerInfo playerInfo;
+    private final BallPlayerInfo playerInfo;
 }
--- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerPreConnectServerEvent.java
+++ b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerPreConnectServerEvent.java
@@ -1,6 +1,6 @@
 package cn.hamster3.mc.plugin.ball.common.event.player;

-import cn.hamster3.mc.plugin.ball.common.entity.PlayerInfo;
+import cn.hamster3.mc.plugin.ball.common.entity.BallPlayerInfo;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.jetbrains.annotations.NotNull;
@@ -17,7 +17,7 @@ public class BallPlayerPreConnectServerEvent {
    public static final String ACTION = "PlayerPreConnectServer";

    @NotNull
-    private final PlayerInfo playerInfo;
+    private final BallPlayerInfo playerInfo;
    @Nullable
    private final String from;
    @NotNull
--- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/server/ServerOnlineEvent.java
+++ b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/server/ServerOnlineEvent.java
@@ -1,6 +1,6 @@
 package cn.hamster3.mc.plugin.ball.common.event.server;

-import cn.hamster3.mc.plugin.ball.common.entity.ServerInfo;
+import cn.hamster3.mc.plugin.ball.common.entity.BallServerInfo;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.jetbrains.annotations.NotNull;
@@ -14,6 +14,6 @@ public class ServerOnlineEvent {
    public static final String ACTION = "ServerOnline";

    @NotNull
-    private final ServerInfo serverInfo;
+    private final BallServerInfo serverInfo;

 }
--- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallListener.java
+++ b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallListener.java
@@ -1,12 +1,12 @@
 package cn.hamster3.mc.plugin.ball.common.listener;

-import cn.hamster3.mc.plugin.ball.common.data.MessageInfo;
-import cn.hamster3.mc.plugin.ball.common.event.operate.*;
+import cn.hamster3.mc.plugin.ball.common.data.BallMessageInfo;
 import cn.hamster3.mc.plugin.ball.common.event.player.*;
 import cn.hamster3.mc.plugin.ball.common.event.server.ServerOfflineEvent;
 import cn.hamster3.mc.plugin.ball.common.event.server.ServerOnlineEvent;
 import org.jetbrains.annotations.NotNull;

+@SuppressWarnings("unused")
 public abstract class BallListener {
    /**
     * 该监听器的执行优先级
@@ -17,25 +17,16 @@ public abstract class BallListener {
        return ListenerPriority.NORMAL;
    }

-    public void onBroadcastPlayerMessage(@NotNull BroadcastPlayerMessageEvent event) {
+    public void onConnectActive() {
    }

-    public void onDispatchConsoleCommand(@NotNull DispatchConsoleCommandEvent event) {
+    public void onConnectInactive() {
    }

-    public void onDispatchPlayerCommand(@NotNull DispatchPlayerCommandEvent event) {
+    public void onConnectException(Throwable throwable) {
    }

-    public void onKickPlayer(@NotNull KickPlayerEvent event) {
-    }
-
-    public void onSendMessageToPlayer(@NotNull SendMessageToPlayerEvent event) {
-    }
-
-    public void onSendPlayerToLocation(@NotNull SendPlayerToLocationEvent event) {
-    }
-
-    public void onSendPlayerToPlayer(@NotNull SendPlayerToPlayerEvent event) {
+    public void onReconnectFailed() {
    }

    public void onBallPlayerPreLogin(@NotNull BallPlayerPreLoginEvent event) {
@@ -68,19 +59,10 @@ public abstract class BallListener {
    public void onServerOnline(@NotNull ServerOnlineEvent event) {
    }

-    public void onMessageSend(@NotNull MessageInfo event) {
+    public void onMessageSend(@NotNull BallMessageInfo event) {
    }

-    public void onMessageReceived(@NotNull MessageInfo event) {
-    }
-
-    public void onConnectInactive() {
-    }
-
-    public void onConnectException(Throwable throwable) {
-    }
-
-    public void onReconnectFailed() {
+    public void onMessageReceived(@NotNull BallMessageInfo event) {
    }

 }