MiniDay/hamster-ball
1
0
Fork 0
Code Issues Pull Requests Actions Releases 9 Activity

perf: 优化代码

Browse Source
This commit is contained in:
叁只仓鼠
2022-10-29 18:06:12 +08:00
parent 71bd002088
commit 55ba78a87e
4 changed files with 139 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

183
hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java
View File

@@ -227,11 +227,7 @@ public abstract class BallAPI {
} }
sendBallMessage( sendBallMessage(new BallMessageInfo(BALL_CHANNEL, ServerOnlineEvent.ACTION, new ServerOnlineEvent(localInfo)), true);
BALL_CHANNEL,
ServerOnlineEvent.ACTION,
new ServerOnlineEvent(localInfo)
);
} }
protected void connect() throws InterruptedException { protected void connect() throws InterruptedException {
@@ -287,11 +283,7 @@ public abstract class BallAPI {
} }
enabled = false; enabled = false;
sendBallMessage( sendBallMessage(new BallMessageInfo(BALL_CHANNEL, ServerOfflineEvent.ACTION, new ServerOfflineEvent(getLocalServerId())), true);
BALL_CHANNEL,
ServerOfflineEvent.ACTION,
new ServerOfflineEvent(getLocalServerId())
);
try (Connection connection = CoreAPI.getInstance().getConnection()) { try (Connection connection = CoreAPI.getInstance().getConnection()) {
PreparedStatement statement = connection.prepareStatement("DELETE FROM " + BallCommonConstants.SQL.SERVER_INFO_TABLE + " WHERE `id`=?;"); PreparedStatement statement = connection.prepareStatement("DELETE FROM " + BallCommonConstants.SQL.SERVER_INFO_TABLE + " WHERE `id`=?;");
@@ -339,12 +331,16 @@ public abstract class BallAPI {
* @param message 消息 * @param message 消息
*/ */
public void broadcastPlayerMessage(@NotNull DisplayMessage message) { public void broadcastPlayerMessage(@NotNull DisplayMessage message) {
sendBallMessage( sendBallMessage(new BallMessageInfo(
BALL_CHANNEL, BALL_CHANNEL,
getLocalServerId(),
null,
BallServerType.PROXY, BallServerType.PROXY,
BroadcastPlayerMessageEvent.ACTION, BroadcastPlayerMessageEvent.ACTION,
CoreConstantObjects.GSON.toJsonTree(
new BroadcastPlayerMessageEvent(message) new BroadcastPlayerMessageEvent(message)
); )
));
} }
/** /**
@@ -355,13 +351,16 @@ public abstract class BallAPI {
* @param command 命令内容 * @param command 命令内容
*/ */
public void dispatchConsoleCommand(@Nullable BallServerType type, @Nullable String serverID, @NotNull String command) { public void dispatchConsoleCommand(@Nullable BallServerType type, @Nullable String serverID, @NotNull String command) {
sendBallMessage( sendBallMessage(new BallMessageInfo(
BALL_CHANNEL, BALL_CHANNEL,
getLocalServerId(),
null,
BallServerType.GAME, BallServerType.GAME,
DispatchConsoleCommandEvent.ACTION, DispatchConsoleCommandEvent.ACTION,
CoreConstantObjects.GSON.toJsonTree(
new DispatchConsoleCommandEvent(type, serverID, command) new DispatchConsoleCommandEvent(type, serverID, command)
)
); ));
} }
/** /**
@@ -372,13 +371,16 @@ public abstract class BallAPI {
* @param command 命令内容 * @param command 命令内容
*/ */
public void dispatchPlayerCommand(@Nullable BallServerType type, @Nullable UUID uuid, @NotNull String command) { public void dispatchPlayerCommand(@Nullable BallServerType type, @Nullable UUID uuid, @NotNull String command) {
sendBallMessage( sendBallMessage(new BallMessageInfo(
BALL_CHANNEL, BALL_CHANNEL,
getLocalServerId(),
null,
BallServerType.GAME, BallServerType.GAME,
DispatchPlayerCommandEvent.ACTION, DispatchPlayerCommandEvent.ACTION,
CoreConstantObjects.GSON.toJsonTree(
new DispatchPlayerCommandEvent(type, uuid, command) new DispatchPlayerCommandEvent(type, uuid, command)
)
); ));
} }
/** /**
@@ -398,46 +400,16 @@ public abstract class BallAPI {
* @param reason 原因 * @param reason 原因
*/ */
public void kickPlayer(@NotNull UUID uuid, @NotNull Component reason) { public void kickPlayer(@NotNull UUID uuid, @NotNull Component reason) {
sendBallMessage( sendBallMessage(new BallMessageInfo(
BALL_CHANNEL, BALL_CHANNEL,
getLocalServerId(),
null,
BallServerType.PROXY, BallServerType.PROXY,
KickPlayerEvent.ACTION, KickPlayerEvent.ACTION,
CoreConstantObjects.GSON.toJsonTree(
new KickPlayerEvent(uuid, reason) new KickPlayerEvent(uuid, reason)
)
); ));
}
/**
* 给玩家发送一条消息
*
* @param uuid 玩家
* @param message 消息
* @param cache 当玩家不在线时，是否缓存消息等待玩家上线再发送
*/
public void sendMessageToPlayer(@NotNull UUID uuid, @NotNull DisplayMessage message, boolean cache) {
BallPlayerInfo info = getPlayerInfo(uuid);
if (info == null || !info.isOnline()) {
if (!cache) {
return;
}
try (Connection connection = CoreAPI.getInstance().getConnection()) {
PreparedStatement statement = connection.prepareStatement("INSERT INTO " + BallCommonConstants.SQL.CACHED_MESSAGE_TABLE + " VALUES(?, ?);");
statement.setString(1, uuid.toString());
statement.setString(2, message.saveToJson().toString());
statement.executeUpdate();
statement.close();
} catch (Exception e) {
e.printStackTrace();
}
return;
}
sendBallMessage(
BALL_CHANNEL,
BallServerType.PROXY,
SendMessageToPlayerEvent.ACTION,
new SendMessageToPlayerEvent(Collections.singleton(uuid), message)
);
} }
/** /**
@@ -447,16 +419,15 @@ public abstract class BallAPI {
* @param message 消息 * @param message 消息
* @param cache 当玩家不在线时，是否缓存消息等待玩家上线再发送 * @param cache 当玩家不在线时，是否缓存消息等待玩家上线再发送
*/ */
public void sendMessageToPlayer(@NotNull Set<UUID> receiver, @NotNull DisplayMessage message, boolean cache) { public void sendMessageToPlayer(@NotNull UUID receiver, @NotNull DisplayMessage message, boolean cache) {
for (UUID uuid : receiver) { BallPlayerInfo info = getPlayerInfo(receiver);
BallPlayerInfo info = getPlayerInfo(uuid);
if (info == null || !info.isOnline()) { if (info == null || !info.isOnline()) {
if (!cache) { if (!cache) {
return; return;
} }
try (Connection connection = CoreAPI.getInstance().getConnection()) { try (Connection connection = CoreAPI.getInstance().getConnection()) {
PreparedStatement statement = connection.prepareStatement("INSERT INTO " + BallCommonConstants.SQL.CACHED_MESSAGE_TABLE + " VALUES(?, ?);"); PreparedStatement statement = connection.prepareStatement("INSERT INTO " + BallCommonConstants.SQL.CACHED_MESSAGE_TABLE + " VALUES(?, ?);");
statement.setString(1, uuid.toString()); statement.setString(1, receiver.toString());
statement.setString(2, message.saveToJson().toString()); statement.setString(2, message.saveToJson().toString());
statement.executeUpdate(); statement.executeUpdate();
statement.close(); statement.close();
@@ -465,13 +436,53 @@ public abstract class BallAPI {
} }
return; return;
} }
} sendBallMessage(new BallMessageInfo(
sendBallMessage(
BALL_CHANNEL, BALL_CHANNEL,
getLocalServerId(),
null,
BallServerType.PROXY, BallServerType.PROXY,
SendMessageToPlayerEvent.ACTION, SendMessageToPlayerEvent.ACTION,
new SendMessageToPlayerEvent(receiver, message) CoreConstantObjects.GSON.toJsonTree(
); new SendMessageToPlayerEvent(Collections.singleton(receiver), message)
)
));
}
/**
* 给玩家发送一条消息
*
* @param receivers 玩家
* @param message 消息
* @param cache 当玩家不在线时，是否缓存消息等待玩家上线再发送
*/
public void sendMessageToPlayer(@NotNull Collection<UUID> receivers, @NotNull DisplayMessage message, boolean cache) {
if (cache) {
for (UUID receiver : receivers) {
BallPlayerInfo info = getPlayerInfo(receiver);
if (info != null && info.isOnline()) {
continue;
}
try (Connection connection = CoreAPI.getInstance().getConnection()) {
PreparedStatement statement = connection.prepareStatement("INSERT INTO " + BallCommonConstants.SQL.CACHED_MESSAGE_TABLE + " VALUES(?, ?);");
statement.setString(1, receiver.toString());
statement.setString(2, message.saveToJson().toString());
statement.executeUpdate();
statement.close();
} catch (Exception e) {
e.printStackTrace();
}
}
}
sendBallMessage(new BallMessageInfo(
BALL_CHANNEL,
getLocalServerId(),
null,
BallServerType.PROXY,
SendMessageToPlayerEvent.ACTION,
CoreConstantObjects.GSON.toJsonTree(
new SendMessageToPlayerEvent(new HashSet<>(receivers), message)
)
));
} }
/** /**
@@ -504,11 +515,11 @@ public abstract class BallAPI {
* @param location 坐标 * @param location 坐标
* @param doneMessage 传送完成后显示的消息 * @param doneMessage 传送完成后显示的消息
*/ */
public void sendPlayerToLocation(@NotNull HashSet<UUID> sendPlayerUUID, @NotNull BallLocation location, @Nullable DisplayMessage doneMessage) { public void sendPlayerToLocation(@NotNull Collection<UUID> sendPlayerUUID, @NotNull BallLocation location, @Nullable DisplayMessage doneMessage) {
sendBallMessage( sendBallMessage(
BALL_CHANNEL, BALL_CHANNEL,
SendPlayerToLocationEvent.ACTION, SendPlayerToLocationEvent.ACTION,
new SendPlayerToLocationEvent(sendPlayerUUID, location, doneMessage) new SendPlayerToLocationEvent(new HashSet<>(sendPlayerUUID), location, doneMessage)
); );
} }
@@ -517,14 +528,14 @@ public abstract class BallAPI {
* <p> * <p>
* 支持跨服传送 * 支持跨服传送
* *
* @param sendPlayerUUID 被传送的玩家 * @param sendPlayer 被传送的玩家
* @param toPlayerUUID 传送的目标玩家 * @param toPlayer 传送的目标玩家
*/ */
public void sendPlayerToPlayer(@NotNull UUID sendPlayerUUID, @NotNull UUID toPlayerUUID, @Nullable DisplayMessage doneMessage, @Nullable DisplayMessage doneTargetMessage) { public void sendPlayerToPlayer(@NotNull UUID sendPlayer, @NotNull UUID toPlayer, @Nullable DisplayMessage doneMessage, @Nullable DisplayMessage doneTargetMessage) {
sendBallMessage( sendBallMessage(
BALL_CHANNEL, BALL_CHANNEL,
SendPlayerToPlayerEvent.ACTION, SendPlayerToPlayerEvent.ACTION,
new SendPlayerToPlayerEvent(Collections.singleton(sendPlayerUUID), toPlayerUUID, doneMessage, doneTargetMessage) new SendPlayerToPlayerEvent(Collections.singleton(sendPlayer), toPlayer, doneMessage, doneTargetMessage)
); );
} }
@@ -534,14 +545,14 @@ public abstract class BallAPI {
* 支持跨服传送 * 支持跨服传送
* *
* @param sendPlayerUUID 被传送的玩家 * @param sendPlayerUUID 被传送的玩家
* @param toPlayerUUID 传送的目标玩家 * @param toPlayer 传送的目标玩家
* @param doneMessage 传送完成后显示的消息 * @param doneMessage 传送完成后显示的消息
*/ */
public void sendPlayerToPlayer(@NotNull HashSet<UUID> sendPlayerUUID, @NotNull UUID toPlayerUUID, @Nullable DisplayMessage doneMessage, @Nullable DisplayMessage doneTargetMessage) { public void sendPlayerToPlayer(@NotNull Collection<UUID> sendPlayerUUID, @NotNull UUID toPlayer, @Nullable DisplayMessage doneMessage, @Nullable DisplayMessage doneTargetMessage) {
sendBallMessage( sendBallMessage(
BALL_CHANNEL, BALL_CHANNEL,
SendPlayerToPlayerEvent.ACTION, SendPlayerToPlayerEvent.ACTION,
new SendPlayerToPlayerEvent(sendPlayerUUID, toPlayerUUID, doneMessage, doneTargetMessage) new SendPlayerToPlayerEvent(new HashSet<>(sendPlayerUUID), toPlayer, doneMessage, doneTargetMessage)
); );
} }
@@ -552,7 +563,7 @@ public abstract class BallAPI {
* @param action 执行动作 * @param action 执行动作
*/ */
public void sendBallMessage(@NotNull String channel, @NotNull String action) { public void sendBallMessage(@NotNull String channel, @NotNull String action) {
sendBallMessage(new BallMessageInfo(channel, getLocalServerId(), null, null, action, null)); sendBallMessage(new BallMessageInfo(channel, action));
} }
/** /**
@@ -563,7 +574,7 @@ public abstract class BallAPI {
* @param content 附加参数 * @param content 附加参数
*/ */
public void sendBallMessage(@NotNull String channel, @NotNull String action, @NotNull String content) { public void sendBallMessage(@NotNull String channel, @NotNull String action, @NotNull String content) {
sendBallMessage(new BallMessageInfo(channel, getLocalServerId(), null, null, action, new JsonPrimitive(content))); sendBallMessage(new BallMessageInfo(channel, action, new JsonPrimitive(content)));
} }
/** /**
@@ -574,7 +585,7 @@ public abstract class BallAPI {
* @param content 附加参数 * @param content 附加参数
*/ */
public void sendBallMessage(@NotNull String channel, @NotNull String action, @NotNull JsonElement content) { public void sendBallMessage(@NotNull String channel, @NotNull String action, @NotNull JsonElement content) {
sendBallMessage(new BallMessageInfo(channel, getLocalServerId(), null, null, action, content)); sendBallMessage(new BallMessageInfo(channel, action, content));
} }
/** /**
@@ -585,29 +596,7 @@ public abstract class BallAPI {
* @param content 附加参数 * @param content 附加参数
*/ */
public void sendBallMessage(@NotNull String channel, @NotNull String action, @NotNull Object content) { public void sendBallMessage(@NotNull String channel, @NotNull String action, @NotNull Object content) {
sendBallMessage(new BallMessageInfo(channel, getLocalServerId(), null, null, action, CoreConstantObjects.GSON.toJsonTree(content))); sendBallMessage(new BallMessageInfo(channel, action, content));
}
/**
* 发送一条有附加参数的消息
*
* @param channel 消息频道
* @param action 执行动作
* @param 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));
}
/**
* 发送一条有附加参数的服务消息
*
* @param channel 消息标签
* @param action 执行动作
* @param 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)));
} }
/** /**

42
hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/data/BallMessageInfo.java
View File

@@ -1,13 +1,13 @@
package cn.hamster3.mc.plugin.ball.common.data; package cn.hamster3.mc.plugin.ball.common.data;
import cn.hamster3.mc.plugin.ball.common.api.BallAPI;
import cn.hamster3.mc.plugin.ball.common.entity.BallServerType; import cn.hamster3.mc.plugin.ball.common.entity.BallServerType;
import cn.hamster3.mc.plugin.core.common.constant.CoreConstantObjects; import cn.hamster3.mc.plugin.core.common.constant.CoreConstantObjects;
import com.google.gson.JsonArray; import com.google.gson.JsonArray;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import lombok.AllArgsConstructor; import com.google.gson.JsonPrimitive;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -19,8 +19,6 @@ import java.util.UUID;
* 服务消息 * 服务消息
*/ */
@Data @Data
@NoArgsConstructor
@AllArgsConstructor
@SuppressWarnings("unused") @SuppressWarnings("unused")
public class BallMessageInfo { public class BallMessageInfo {
/** /**
@@ -64,6 +62,42 @@ public class BallMessageInfo {
*/ */
private JsonElement content; private JsonElement content;
public BallMessageInfo(@NotNull String channel, String action) {
this.channel = channel;
senderID = BallAPI.getInstance().getLocalServerId();
this.action = action;
}
public BallMessageInfo(@NotNull String channel, String action, String content) {
this.channel = channel;
senderID = BallAPI.getInstance().getLocalServerId();
this.action = action;
this.content = new JsonPrimitive(content);
}
public BallMessageInfo(@NotNull String channel, String action, JsonElement content) {
this.channel = channel;
senderID = BallAPI.getInstance().getLocalServerId();
this.action = action;
this.content = content;
}
public BallMessageInfo(@NotNull String channel, String action, Object content) {
this.channel = channel;
senderID = BallAPI.getInstance().getLocalServerId();
this.action = action;
this.content = CoreConstantObjects.GSON.toJsonTree(content);
}
public BallMessageInfo(@NotNull String channel, @NotNull String senderID, @Nullable String receiverID, @Nullable BallServerType receiverType, String action, JsonElement content) {
this.channel = channel;
this.senderID = senderID;
this.receiverID = receiverID;
this.receiverType = receiverType;
this.action = action;
this.content = content;
}
/** /**
* 序列化至 Json * 序列化至 Json
* *

2
hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/SendMessageToPlayerEvent.java
View File

@@ -14,7 +14,7 @@ public class SendMessageToPlayerEvent {
public static final String ACTION = "SendMessageToPlayer"; public static final String ACTION = "SendMessageToPlayer";
@NotNull @NotNull
private final Set<UUID> receiver; private final Set<UUID> receivers;
@NotNull @NotNull
private final DisplayMessage message; private final DisplayMessage message;
} }

14
hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallListener.java
View File

@@ -20,6 +20,12 @@ public abstract class BallListener {
public void onConnectActive() { public void onConnectActive() {
} }
public void onMessageReceived(@NotNull BallMessageInfo event) {
}
public void onMessageSend(@NotNull BallMessageInfo event) {
}
public void onConnectInactive() { public void onConnectInactive() {
} }
@@ -53,16 +59,10 @@ public abstract class BallListener {
public void onBallPlayerChat(@NotNull BallPlayerChatEvent event) { public void onBallPlayerChat(@NotNull BallPlayerChatEvent event) {
} }
public void onServerOffline(@NotNull ServerOfflineEvent event) {
}
public void onServerOnline(@NotNull ServerOnlineEvent event) { public void onServerOnline(@NotNull ServerOnlineEvent event) {
} }
public void onMessageSend(@NotNull BallMessageInfo event) { public void onServerOffline(@NotNull ServerOfflineEvent event) {
}
public void onMessageReceived(@NotNull BallMessageInfo event) {
} }
} }