From 3585c82233c68ebc45d0665d485adaef775e4892 Mon Sep 17 00:00:00 2001 From: MiniDay <372403923@qq.com> Date: Mon, 19 Feb 2024 16:16:33 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=85=BC=E5=AE=B9=E6=96=B0=E7=89=88?= =?UTF-8?q?=E4=BB=93=E9=BC=A0=E7=90=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 4 ++-- hamster-ball-bridge/build.gradle | 2 +- .../service/bukkit/BallBridgePlugin.java | 2 +- .../service/bukkit/api/ServiceMessageAPI.java | 4 ++-- .../bukkit/listener/BridgeListener.java | 19 ++++++++----------- .../service/bungee/BallBridgePlugin.java | 2 +- .../bungee/listener/BridgeListener.java | 19 ++++++++----------- hamster-lobby/build.gradle | 2 +- .../bungee/listener/ServiceListener.java | 6 ++---- hamster-tpa/build.gradle | 2 +- .../mc/plugin/tpa/listener/MainListener.java | 10 ++++------ 11 files changed, 31 insertions(+), 41 deletions(-) diff --git a/gradle.properties b/gradle.properties index eabadde..6f862e0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ org.gradle.jvmargs=-Xmx2G spigot_api_version=1.20.2-R0.1-SNAPSHOT bungeecord_api_version=1.20-R0.1-SNAPSHOT -hamster_core_version=1.1.0 -hamster_ball_version=1.4.1 +hamster_core_version=1.2.2 +hamster_ball_version=1.5.1 placeholder_api_version=2.11.2 \ No newline at end of file diff --git a/hamster-ball-bridge/build.gradle b/hamster-ball-bridge/build.gradle index ccc5acd..e5b677d 100644 --- a/hamster-ball-bridge/build.gradle +++ b/hamster-ball-bridge/build.gradle @@ -1,4 +1,4 @@ -version = '1.4.2' +version = '1.4.3' setArchivesBaseName("HamsterBall-Bridge") dependencies { diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/BallBridgePlugin.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/BallBridgePlugin.java index fafb4bd..344ad18 100644 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/BallBridgePlugin.java +++ b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/BallBridgePlugin.java @@ -35,6 +35,6 @@ public class BallBridgePlugin extends JavaPlugin { getLogger().warning("未找到 PlaceholderAPI 插件, 取消注册占位符."); } }); - BallAPI.getInstance().getSubConnection().sync().subscribe("HamsterService"); + BallAPI.getInstance().subscribe("HamsterService"); } } diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/api/ServiceMessageAPI.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/api/ServiceMessageAPI.java index d979bb9..b40a2bc 100644 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/api/ServiceMessageAPI.java +++ b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/api/ServiceMessageAPI.java @@ -27,7 +27,7 @@ public abstract class ServiceMessageAPI { * @param tag 标签 */ public static void subscribeTag(String tag) { - BallAPI.getInstance().getSubConnection().sync().subscribe(tag); + BallAPI.getInstance().subscribe(tag); } /** @@ -36,7 +36,7 @@ public abstract class ServiceMessageAPI { * @param tag 标签 */ public static void unsubscribeTag(String tag) { - BallAPI.getInstance().getSubConnection().sync().unsubscribe(tag); + BallAPI.getInstance().unsubscribe(tag); } /** diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/listener/BridgeListener.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/listener/BridgeListener.java index 889318e..81b2760 100644 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/listener/BridgeListener.java +++ b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/listener/BridgeListener.java @@ -1,6 +1,5 @@ package cn.hamster3.service.bukkit.listener; -import cn.hamster3.mc.plugin.ball.common.data.BallMessage; import cn.hamster3.service.bukkit.api.ServiceInfoAPI; import cn.hamster3.service.bukkit.event.MessageReceivedEvent; import cn.hamster3.service.bukkit.event.MessageSentEvent; @@ -16,25 +15,23 @@ public class BridgeListener { @Subscribe public void onMessageSent(cn.hamster3.mc.plugin.ball.common.event.message.MessageSentEvent event) { - BallMessage ballMessage = event.getMessage(); Bukkit.getPluginManager().callEvent(new MessageSentEvent(new ServiceMessageInfo( - ServiceInfoAPI.getSenderInfo(ballMessage.getSenderID()), - ballMessage.getReceiverID(), + ServiceInfoAPI.getSenderInfo(event.getSenderID()), + event.getReceiverID(), event.getChannel(), - ballMessage.getAction(), - ballMessage.getContent() + event.getAction(), + event.getContent() ))); } @Subscribe public void onMessageReceived(cn.hamster3.mc.plugin.ball.common.event.message.MessageReceivedEvent event) { - BallMessage ballMessage = event.getMessage(); Bukkit.getPluginManager().callEvent(new MessageReceivedEvent(new ServiceMessageInfo( - ServiceInfoAPI.getSenderInfo(ballMessage.getSenderID()), - ballMessage.getReceiverID(), + ServiceInfoAPI.getSenderInfo(event.getSenderID()), + event.getReceiverID(), event.getChannel(), - ballMessage.getAction(), - ballMessage.getContent() + event.getAction(), + event.getContent() ))); } } diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/BallBridgePlugin.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/BallBridgePlugin.java index 3be85d1..e4d6292 100644 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/BallBridgePlugin.java +++ b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/BallBridgePlugin.java @@ -22,6 +22,6 @@ public class BallBridgePlugin extends Plugin { BallAPI.getInstance().getEventBus().register(BridgeListener.INSTANCE); ProxyServer.getInstance().getPluginManager().registerListener(this, ServiceMainListener.INSTANCE); ProxyServer.getInstance().getPluginManager().registerCommand(this, ServiceCommand.INSTANCE); - BallAPI.getInstance().getSubConnection().sync().subscribe("HamsterService"); + BallAPI.getInstance().subscribe("HamsterService"); } } diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/listener/BridgeListener.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/listener/BridgeListener.java index 2f6ac75..5ac676c 100644 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/listener/BridgeListener.java +++ b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/listener/BridgeListener.java @@ -1,6 +1,5 @@ package cn.hamster3.service.bungee.listener; -import cn.hamster3.mc.plugin.ball.common.data.BallMessage; import cn.hamster3.service.bungee.api.ServiceInfoAPI; import cn.hamster3.service.bungee.event.MessageReceivedEvent; import cn.hamster3.service.bungee.event.MessageSentEvent; @@ -16,25 +15,23 @@ public class BridgeListener { @Subscribe public void onMessageSent(cn.hamster3.mc.plugin.ball.common.event.message.MessageSentEvent event) { - BallMessage ballMessage = event.getMessage(); ProxyServer.getInstance().getPluginManager().callEvent(new MessageSentEvent(new ServiceMessageInfo( - ServiceInfoAPI.getSenderInfo(ballMessage.getSenderID()), - ballMessage.getReceiverID(), + ServiceInfoAPI.getSenderInfo(event.getSenderID()), + event.getReceiverID(), event.getChannel(), - ballMessage.getAction(), - ballMessage.getContent() + event.getAction(), + event.getContent() ))); } @Subscribe public void onMessageReceived(cn.hamster3.mc.plugin.ball.common.event.message.MessageReceivedEvent event) { - BallMessage ballMessage = event.getMessage(); ProxyServer.getInstance().getPluginManager().callEvent(new MessageReceivedEvent(new ServiceMessageInfo( - ServiceInfoAPI.getSenderInfo(ballMessage.getSenderID()), - ballMessage.getReceiverID(), + ServiceInfoAPI.getSenderInfo(event.getSenderID()), + event.getReceiverID(), event.getChannel(), - ballMessage.getAction(), - ballMessage.getContent() + event.getAction(), + event.getContent() ))); } } diff --git a/hamster-lobby/build.gradle b/hamster-lobby/build.gradle index 9ff9d64..532f943 100644 --- a/hamster-lobby/build.gradle +++ b/hamster-lobby/build.gradle @@ -1,4 +1,4 @@ -version '1.1.0' +version '1.1.1' setArchivesBaseName("HamsterLobby") dependencies { diff --git a/hamster-lobby/src/main/java/cn/hamster3/mc/plugin/lobby/bungee/listener/ServiceListener.java b/hamster-lobby/src/main/java/cn/hamster3/mc/plugin/lobby/bungee/listener/ServiceListener.java index 551be52..43539e4 100644 --- a/hamster-lobby/src/main/java/cn/hamster3/mc/plugin/lobby/bungee/listener/ServiceListener.java +++ b/hamster-lobby/src/main/java/cn/hamster3/mc/plugin/lobby/bungee/listener/ServiceListener.java @@ -1,6 +1,5 @@ package cn.hamster3.mc.plugin.lobby.bungee.listener; -import cn.hamster3.mc.plugin.ball.common.data.BallMessage; import cn.hamster3.mc.plugin.ball.common.event.message.MessageReceivedEvent; import cn.hamster3.mc.plugin.ball.common.event.server.ServerOfflineEvent; import cn.hamster3.mc.plugin.lobby.bungee.LobbyPlugin; @@ -18,10 +17,9 @@ public class ServiceListener implements Listener { if (!"HamsterLobby".equals(event.getChannel())) { return; } - BallMessage ballMessage = event.getMessage(); - switch (ballMessage.getAction()) { + switch (event.getAction()) { case "registerLobby": { - String senderID = ballMessage.getSenderID(); + String senderID = event.getSenderID(); LobbyPlugin.LOBBY_SERVERS.add(senderID); LobbyPlugin.getInstance().getLogger().info("已添加大厅服务器: " + senderID); break; diff --git a/hamster-tpa/build.gradle b/hamster-tpa/build.gradle index 3690877..b854ecb 100644 --- a/hamster-tpa/build.gradle +++ b/hamster-tpa/build.gradle @@ -1,4 +1,4 @@ -version = '1.1.0' +version = '1.1.1' setArchivesBaseName("HamsterTPA") dependencies { diff --git a/hamster-tpa/src/main/java/cn/hamster3/mc/plugin/tpa/listener/MainListener.java b/hamster-tpa/src/main/java/cn/hamster3/mc/plugin/tpa/listener/MainListener.java index 4cacf09..370a4f5 100644 --- a/hamster-tpa/src/main/java/cn/hamster3/mc/plugin/tpa/listener/MainListener.java +++ b/hamster-tpa/src/main/java/cn/hamster3/mc/plugin/tpa/listener/MainListener.java @@ -1,6 +1,5 @@ package cn.hamster3.mc.plugin.tpa.listener; -import cn.hamster3.mc.plugin.ball.common.data.BallMessage; import cn.hamster3.mc.plugin.ball.common.event.message.MessageReceivedEvent; import cn.hamster3.mc.plugin.tpa.HamsterTPAPlugin; import cn.hamster3.mc.plugin.tpa.core.DataManager; @@ -21,10 +20,9 @@ public final class MainListener implements Listener { if (!HamsterTPAPlugin.BALL_CHANNEL.equals(event.getChannel())) { return; } - BallMessage ballMessage = event.getMessage(); - switch (ballMessage.getAction()) { + switch (event.getAction()) { case "setPlayerUseTime": { - JsonObject object = ballMessage.getContentAsJsonObject(); + JsonObject object = event.getContentAsJsonObject(); DataManager.setPlayerUseTime( UUID.fromString(object.get("uuid").getAsString()), object.get("time").getAsLong(), @@ -33,7 +31,7 @@ public final class MainListener implements Listener { break; } case "sendTPA": { - JsonObject object = ballMessage.getContentAsJsonObject(); + JsonObject object = event.getContentAsJsonObject(); DataManager.sendTPA( UUID.fromString(object.get("sender").getAsString()), UUID.fromString(object.get("target").getAsString()), @@ -43,7 +41,7 @@ public final class MainListener implements Listener { break; } case "clearTPAList": { - DataManager.clearTPAList(ballMessage.getContentAsUUID(), false); + DataManager.clearTPAList(event.getContentAsUUID(), false); break; } case "": {