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

feat: 适配Core更新

Browse Source
This commit is contained in:
叁只仓鼠
2023-05-30 04:31:19 +08:00
parent 1a59268a7d
commit 537c6eb0a7
10 changed files with 73 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,8 +15,8 @@ import cn.hamster3.mc.plugin.ball.common.event.server.ServerOnlineEvent;
import cn.hamster3.mc.plugin.ball.common.listener.BallListener;
import cn.hamster3.mc.plugin.ball.common.listener.ListenerPriority;
import cn.hamster3.mc.plugin.core.common.api.CoreAPI;
import cn.hamster3.mc.plugin.core.common.constant.CoreConstantObjects;
import cn.hamster3.mc.plugin.core.common.data.DisplayMessage;
import cn.hamster3.mc.plugin.core.common.util.CoreUtils;
import com.google.gson.JsonElement;
import com.google.gson.JsonPrimitive;
import io.netty.bootstrap.Bootstrap;
@@ -337,7 +337,7 @@ public abstract class BallAPI {
* @param message 消息
*/
public void broadcastPlayerMessage(@NotNull String message) {
broadcastPlayerMessage(DisplayMessage.message(message));
broadcastPlayerMessage(new DisplayMessage().setMessage(message));
}
/**
@@ -352,7 +352,7 @@ public abstract class BallAPI {
null,
BallServerType.PROXY,
BroadcastPlayerMessageEvent.ACTION,
CoreConstantObjects.GSON.toJsonTree(
CoreUtils.GSON.toJsonTree(
new BroadcastPlayerMessageEvent(message)
)
));
@@ -372,7 +372,7 @@ public abstract class BallAPI {
null,
BallServerType.GAME,
DispatchConsoleCommandEvent.ACTION,
CoreConstantObjects.GSON.toJsonTree(
CoreUtils.GSON.toJsonTree(
new DispatchConsoleCommandEvent(type, serverID, command)
)
));
@@ -392,7 +392,7 @@ public abstract class BallAPI {
null,
BallServerType.GAME,
DispatchPlayerCommandEvent.ACTION,
CoreConstantObjects.GSON.toJsonTree(
CoreUtils.GSON.toJsonTree(
new DispatchPlayerCommandEvent(type, uuid, command)
)
));
@@ -421,7 +421,7 @@ public abstract class BallAPI {
null,
BallServerType.PROXY,
KickPlayerEvent.ACTION,
CoreConstantObjects.GSON.toJsonTree(
CoreUtils.GSON.toJsonTree(
new KickPlayerEvent(uuid, reason)
)
));
@@ -443,7 +443,7 @@ public abstract class BallAPI {
try (Connection connection = CoreAPI.getInstance().getConnection()) {
PreparedStatement statement = connection.prepareStatement("INSERT INTO `hamster_ball_cached_message` VALUES(?, ?);");
statement.setString(1, receiver.toString());
statement.setString(2, message.saveToJson().toString());
statement.setString(2, message.toJson().toString());
statement.executeUpdate();
statement.close();
} catch (Exception e) {
@@ -457,7 +457,7 @@ public abstract class BallAPI {
null,
BallServerType.PROXY,
SendMessageToPlayerEvent.ACTION,
CoreConstantObjects.GSON.toJsonTree(
CoreUtils.GSON.toJsonTree(
new SendMessageToPlayerEvent(Collections.singleton(receiver), message)
)
));
@@ -480,7 +480,7 @@ public abstract class BallAPI {
try (Connection connection = CoreAPI.getInstance().getConnection()) {
PreparedStatement statement = connection.prepareStatement("INSERT INTO `hamster_ball_cached_message` VALUES(?, ?);");
statement.setString(1, receiver.toString());
statement.setString(2, message.saveToJson().toString());
statement.setString(2, message.toJson().toString());
statement.executeUpdate();
statement.close();
} catch (Exception e) {
@@ -494,7 +494,7 @@ public abstract class BallAPI {
null,
BallServerType.PROXY,
SendMessageToPlayerEvent.ACTION,
CoreConstantObjects.GSON.toJsonTree(
CoreUtils.GSON.toJsonTree(
new SendMessageToPlayerEvent(new HashSet<>(receivers), message)
)
));
@@ -634,7 +634,7 @@ public abstract class BallAPI {
getLogger().warning("由于服务不可用，有一条消息发送失败了: " + messageInfo);
return;
}
ChannelFuture future = channel.writeAndFlush(CoreConstantObjects.GSON.toJson(messageInfo));
ChannelFuture future = channel.writeAndFlush(CoreUtils.GSON.toJson(messageInfo));
if (block) {
try {
future.await();
@@ -659,7 +659,7 @@ public abstract class BallAPI {
statement.setString(1, uuid.toString());
ResultSet set = statement.executeQuery();
while (set.next()) {
DisplayMessage msg = CoreConstantObjects.GSON.fromJson(set.getString("msg"), DisplayMessage.class);
DisplayMessage msg = CoreUtils.GSON.fromJson(set.getString("msg"), DisplayMessage.class);
list.add(msg);
}
statement.close();

26
hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/connector/BallChannelHandler.java
View File

@@ -6,7 +6,7 @@ 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 cn.hamster3.mc.plugin.ball.common.listener.BallListener;
import cn.hamster3.mc.plugin.core.common.constant.CoreConstantObjects;
import cn.hamster3.mc.plugin.core.common.util.CoreUtils;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.SimpleChannelInboundHandler;
@@ -27,7 +27,7 @@ public class BallChannelHandler extends SimpleChannelInboundHandler<String> {
if ("pong".equals(message)) {
return;
}
BallMessageInfo info = CoreConstantObjects.GSON.fromJson(message, BallMessageInfo.class);
BallMessageInfo info = CoreUtils.GSON.fromJson(message, BallMessageInfo.class);
for (BallListener listener : BallAPI.getInstance().getListeners()) {
try {
listener.onMessageReceived(info);
@@ -40,7 +40,7 @@ public class BallChannelHandler extends SimpleChannelInboundHandler<String> {
}
switch (info.getAction()) {
case BallPlayerPreLoginEvent.ACTION: {
BallPlayerPreLoginEvent event = CoreConstantObjects.GSON.fromJson(info.getContent(), BallPlayerPreLoginEvent.class);
BallPlayerPreLoginEvent event = CoreUtils.GSON.fromJson(info.getContent(), BallPlayerPreLoginEvent.class);
for (BallListener listener : BallAPI.getInstance().getListeners()) {
try {
listener.onBallPlayerPreLogin(event);
@@ -51,7 +51,7 @@ public class BallChannelHandler extends SimpleChannelInboundHandler<String> {
break;
}
case BallPlayerLoginEvent.ACTION: {
BallPlayerLoginEvent event = CoreConstantObjects.GSON.fromJson(info.getContent(), BallPlayerLoginEvent.class);
BallPlayerLoginEvent event = CoreUtils.GSON.fromJson(info.getContent(), BallPlayerLoginEvent.class);
for (BallListener listener : BallAPI.getInstance().getListeners()) {
try {
listener.onBallPlayerLogin(event);
@@ -62,7 +62,7 @@ public class BallChannelHandler extends SimpleChannelInboundHandler<String> {
break;
}
case BallPlayerPostLoginEvent.ACTION: {
BallPlayerPostLoginEvent event = CoreConstantObjects.GSON.fromJson(info.getContent(), BallPlayerPostLoginEvent.class);
BallPlayerPostLoginEvent event = CoreUtils.GSON.fromJson(info.getContent(), BallPlayerPostLoginEvent.class);
for (BallListener listener : BallAPI.getInstance().getListeners()) {
try {
listener.onBallPlayerPostLogin(event);
@@ -73,7 +73,7 @@ public class BallChannelHandler extends SimpleChannelInboundHandler<String> {
break;
}
case BallPlayerPreConnectServerEvent.ACTION: {
BallPlayerPreConnectServerEvent event = CoreConstantObjects.GSON.fromJson(info.getContent(), BallPlayerPreConnectServerEvent.class);
BallPlayerPreConnectServerEvent event = CoreUtils.GSON.fromJson(info.getContent(), BallPlayerPreConnectServerEvent.class);
for (BallListener listener : BallAPI.getInstance().getListeners()) {
try {
listener.onBallPlayerPreConnectServer(event);
@@ -84,7 +84,7 @@ public class BallChannelHandler extends SimpleChannelInboundHandler<String> {
break;
}
case BallPlayerConnectServerEvent.ACTION: {
BallPlayerConnectServerEvent event = CoreConstantObjects.GSON.fromJson(info.getContent(), BallPlayerConnectServerEvent.class);
BallPlayerConnectServerEvent event = CoreUtils.GSON.fromJson(info.getContent(), BallPlayerConnectServerEvent.class);
for (BallListener listener : BallAPI.getInstance().getListeners()) {
try {
listener.onBallPlayerConnectServer(event);
@@ -95,7 +95,7 @@ public class BallChannelHandler extends SimpleChannelInboundHandler<String> {
break;
}
case BallPlayerPostConnectServerEvent.ACTION: {
BallPlayerPostConnectServerEvent event = CoreConstantObjects.GSON.fromJson(info.getContent(), BallPlayerPostConnectServerEvent.class);
BallPlayerPostConnectServerEvent event = CoreUtils.GSON.fromJson(info.getContent(), BallPlayerPostConnectServerEvent.class);
for (BallListener listener : BallAPI.getInstance().getListeners()) {
try {
listener.onBallPlayerPostConnectServer(event);
@@ -106,7 +106,7 @@ public class BallChannelHandler extends SimpleChannelInboundHandler<String> {
break;
}
case BallPlayerLogoutEvent.ACTION: {
BallPlayerLogoutEvent event = CoreConstantObjects.GSON.fromJson(info.getContent(), BallPlayerLogoutEvent.class);
BallPlayerLogoutEvent event = CoreUtils.GSON.fromJson(info.getContent(), BallPlayerLogoutEvent.class);
for (BallListener listener : BallAPI.getInstance().getListeners()) {
try {
listener.onBallPlayerLogout(event);
@@ -117,7 +117,7 @@ public class BallChannelHandler extends SimpleChannelInboundHandler<String> {
break;
}
case BallPlayerInfoUpdateEvent.ACTION: {
BallPlayerInfoUpdateEvent event = CoreConstantObjects.GSON.fromJson(info.getContent(), BallPlayerInfoUpdateEvent.class);
BallPlayerInfoUpdateEvent event = CoreUtils.GSON.fromJson(info.getContent(), BallPlayerInfoUpdateEvent.class);
for (BallListener listener : BallAPI.getInstance().getListeners()) {
try {
listener.onBallPlayerInfoUpdate(event);
@@ -128,7 +128,7 @@ public class BallChannelHandler extends SimpleChannelInboundHandler<String> {
break;
}
case BallPlayerChatEvent.ACTION: {
BallPlayerChatEvent event = CoreConstantObjects.GSON.fromJson(info.getContent(), BallPlayerChatEvent.class);
BallPlayerChatEvent event = CoreUtils.GSON.fromJson(info.getContent(), BallPlayerChatEvent.class);
for (BallListener listener : BallAPI.getInstance().getListeners()) {
try {
listener.onBallPlayerChat(event);
@@ -139,7 +139,7 @@ public class BallChannelHandler extends SimpleChannelInboundHandler<String> {
break;
}
case ServerOfflineEvent.ACTION: {
ServerOfflineEvent event = CoreConstantObjects.GSON.fromJson(info.getContent(), ServerOfflineEvent.class);
ServerOfflineEvent event = CoreUtils.GSON.fromJson(info.getContent(), ServerOfflineEvent.class);
for (BallListener listener : BallAPI.getInstance().getListeners()) {
try {
listener.onServerOffline(event);
@@ -150,7 +150,7 @@ public class BallChannelHandler extends SimpleChannelInboundHandler<String> {
break;
}
case ServerOnlineEvent.ACTION: {
ServerOnlineEvent event = CoreConstantObjects.GSON.fromJson(info.getContent(), ServerOnlineEvent.class);
ServerOnlineEvent event = CoreUtils.GSON.fromJson(info.getContent(), ServerOnlineEvent.class);
for (BallListener listener : BallAPI.getInstance().getListeners()) {
try {
listener.onServerOnline(event);

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

@@ -1,6 +1,6 @@
package cn.hamster3.mc.plugin.ball.common.data;
import cn.hamster3.mc.plugin.core.common.constant.CoreConstantObjects;
import cn.hamster3.mc.plugin.core.common.util.CoreUtils;
import com.google.gson.JsonElement;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -19,11 +19,11 @@ public class BallBlockPos {
private int z;
public static BallBlockPos fromJson(String json) {
return CoreConstantObjects.GSON.fromJson(json, BallBlockPos.class);
return CoreUtils.GSON.fromJson(json, BallBlockPos.class);
}
public JsonElement toJson() {
return CoreConstantObjects.GSON.toJsonTree(this);
return CoreUtils.GSON.toJsonTree(this);
}
@NotNull

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

@@ -1,6 +1,6 @@
package cn.hamster3.mc.plugin.ball.common.data;
import cn.hamster3.mc.plugin.core.common.constant.CoreConstantObjects;
import cn.hamster3.mc.plugin.core.common.util.CoreUtils;
import com.google.gson.JsonElement;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -22,11 +22,11 @@ public class BallLocation {
private float pitch;
public static BallLocation fromJson(String json) {
return CoreConstantObjects.GSON.fromJson(json, BallLocation.class);
return CoreUtils.GSON.fromJson(json, BallLocation.class);
}
public JsonElement toJson() {
return CoreConstantObjects.GSON.toJsonTree(this);
return CoreUtils.GSON.toJsonTree(this);
}
@NotNull

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

@@ -2,7 +2,7 @@ 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.core.common.constant.CoreConstantObjects;
import cn.hamster3.mc.plugin.core.common.util.CoreUtils;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
@@ -21,11 +21,6 @@ import java.util.UUID;
@Data
@SuppressWarnings("unused")
public class BallMessageInfo {
/**
* 消息的频道
*/
@NotNull
private String channel;
/**
* 消息发送者
*/
@@ -49,11 +44,17 @@ public class BallMessageInfo {
*/
@Nullable
private BallServerType receiverType;
/**
* 消息的频道
*/
@NotNull
private String channel;
/**
* 消息动作
* <p>
* 一般用这个来判断插件应该如何处理这条消息
*/
@NotNull
private String action;
/**
* 消息内容
@@ -62,34 +63,35 @@ public class BallMessageInfo {
*/
private JsonElement content;
public BallMessageInfo(@NotNull String channel, String action) {
this.channel = channel;
public BallMessageInfo(@NotNull String channel, @NotNull String action) {
senderID = BallAPI.getInstance().getLocalServerId();
this.channel = channel;
this.action = action;
}
public BallMessageInfo(@NotNull String channel, String action, String content) {
this.channel = channel;
public BallMessageInfo(@NotNull String channel, @NotNull String action, String content) {
senderID = BallAPI.getInstance().getLocalServerId();
this.channel = channel;
this.action = action;
this.content = new JsonPrimitive(content);
}
public BallMessageInfo(@NotNull String channel, String action, JsonElement content) {
public BallMessageInfo(@NotNull String channel, @NotNull 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) {
public BallMessageInfo(@NotNull String channel, @NotNull String action, Object content) {
this.channel = channel;
senderID = BallAPI.getInstance().getLocalServerId();
this.action = action;
this.content = CoreConstantObjects.GSON.toJsonTree(content);
this.content = CoreUtils.GSON.toJsonTree(content);
}
public BallMessageInfo(@NotNull String channel, @NotNull String senderID, @Nullable String receiverID, @Nullable BallServerType receiverType, String action, JsonElement content) {
public BallMessageInfo(@NotNull String channel, @NotNull String senderID, @Nullable String receiverID,
@Nullable BallServerType receiverType, @NotNull String action, @Nullable JsonElement content) {
this.channel = channel;
this.senderID = senderID;
this.receiverID = receiverID;
@@ -126,8 +128,8 @@ public class BallMessageInfo {
* @param <T> 对象类型
* @return Java 对象
*/
public <T> T getContentAs(Class<T> clazz) {
return CoreConstantObjects.GSON.fromJson(content, clazz);
public <T> T getContentAs(@NotNull Class<T> clazz) {
return CoreUtils.GSON.fromJson(content, clazz);
}
/**
@@ -135,6 +137,7 @@ public class BallMessageInfo {
*
* @return 消息内容
*/
@NotNull
public String getContentAsString() {
return content.getAsString();
}
@@ -151,14 +154,17 @@ public class BallMessageInfo {
return content.getAsLong();
}
@NotNull
public BigInteger getContentAsBigInteger() {
return content.getAsBigInteger();
}
@NotNull
public BigDecimal getContentAsBigDecimal() {
return content.getAsBigDecimal();
}
@NotNull
public UUID getContentAsUUID() {
return UUID.fromString(content.getAsString());
}
@@ -168,6 +174,7 @@ public class BallMessageInfo {
*
* @return 消息内容
*/
@NotNull
public JsonObject getContentAsJsonObject() {
return content.getAsJsonObject();
}
@@ -177,6 +184,7 @@ public class BallMessageInfo {
*
* @return 消息内容
*/
@NotNull
public JsonArray getContentAsJsonArray() {
return content.getAsJsonArray();
}