MiniDay/hamster-little-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 兼容新版仓鼠球

Browse Source
This commit is contained in:
叁只仓鼠
2024-02-19 16:16:33 +08:00
parent 80ed33354d
commit 3585c82233
11 changed files with 31 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gradle.properties
View File

@@ -1,6 +1,6 @@
org.gradle.jvmargs=-Xmx2G org.gradle.jvmargs=-Xmx2G
spigot_api_version=1.20.2-R0.1-SNAPSHOT spigot_api_version=1.20.2-R0.1-SNAPSHOT
bungeecord_api_version=1.20-R0.1-SNAPSHOT bungeecord_api_version=1.20-R0.1-SNAPSHOT
hamster_core_version=1.1.0 hamster_core_version=1.2.2
hamster_ball_version=1.4.1 hamster_ball_version=1.5.1
placeholder_api_version=2.11.2 placeholder_api_version=2.11.2

2
hamster-ball-bridge/build.gradle
View File

@@ -1,4 +1,4 @@
version = '1.4.2' version = '1.4.3'
setArchivesBaseName("HamsterBall-Bridge") setArchivesBaseName("HamsterBall-Bridge")
dependencies { dependencies {

2
hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/BallBridgePlugin.java
View File

@@ -35,6 +35,6 @@ public class BallBridgePlugin extends JavaPlugin {
getLogger().warning("未找到 PlaceholderAPI 插件, 取消注册占位符."); getLogger().warning("未找到 PlaceholderAPI 插件, 取消注册占位符.");
} }
}); });
BallAPI.getInstance().getSubConnection().sync().subscribe("HamsterService"); BallAPI.getInstance().subscribe("HamsterService");
} }
} }

4
hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/api/ServiceMessageAPI.java
View File

@@ -27,7 +27,7 @@ public abstract class ServiceMessageAPI {
* @param tag 标签 * @param tag 标签
*/ */
public static void subscribeTag(String 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 标签 * @param tag 标签
*/ */
public static void unsubscribeTag(String tag) { public static void unsubscribeTag(String tag) {
BallAPI.getInstance().getSubConnection().sync().unsubscribe(tag); BallAPI.getInstance().unsubscribe(tag);
} }
/** /**

19
hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/listener/BridgeListener.java
View File

@@ -1,6 +1,5 @@
package cn.hamster3.service.bukkit.listener; 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.api.ServiceInfoAPI;
import cn.hamster3.service.bukkit.event.MessageReceivedEvent; import cn.hamster3.service.bukkit.event.MessageReceivedEvent;
import cn.hamster3.service.bukkit.event.MessageSentEvent; import cn.hamster3.service.bukkit.event.MessageSentEvent;
@@ -16,25 +15,23 @@ public class BridgeListener {
@Subscribe @Subscribe
public void onMessageSent(cn.hamster3.mc.plugin.ball.common.event.message.MessageSentEvent event) { public void onMessageSent(cn.hamster3.mc.plugin.ball.common.event.message.MessageSentEvent event) {
BallMessage ballMessage = event.getMessage();
Bukkit.getPluginManager().callEvent(new MessageSentEvent(new ServiceMessageInfo( Bukkit.getPluginManager().callEvent(new MessageSentEvent(new ServiceMessageInfo(
ServiceInfoAPI.getSenderInfo(ballMessage.getSenderID()), ServiceInfoAPI.getSenderInfo(event.getSenderID()),
ballMessage.getReceiverID(), event.getReceiverID(),
event.getChannel(), event.getChannel(),
ballMessage.getAction(), event.getAction(),
ballMessage.getContent() event.getContent()
))); )));
} }
@Subscribe @Subscribe
public void onMessageReceived(cn.hamster3.mc.plugin.ball.common.event.message.MessageReceivedEvent event) { public void onMessageReceived(cn.hamster3.mc.plugin.ball.common.event.message.MessageReceivedEvent event) {
BallMessage ballMessage = event.getMessage();
Bukkit.getPluginManager().callEvent(new MessageReceivedEvent(new ServiceMessageInfo( Bukkit.getPluginManager().callEvent(new MessageReceivedEvent(new ServiceMessageInfo(
ServiceInfoAPI.getSenderInfo(ballMessage.getSenderID()), ServiceInfoAPI.getSenderInfo(event.getSenderID()),
ballMessage.getReceiverID(), event.getReceiverID(),
event.getChannel(), event.getChannel(),
ballMessage.getAction(), event.getAction(),
ballMessage.getContent() event.getContent()
))); )));
} }
} }

2
hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/BallBridgePlugin.java
View File

@@ -22,6 +22,6 @@ public class BallBridgePlugin extends Plugin {
BallAPI.getInstance().getEventBus().register(BridgeListener.INSTANCE); BallAPI.getInstance().getEventBus().register(BridgeListener.INSTANCE);
ProxyServer.getInstance().getPluginManager().registerListener(this, ServiceMainListener.INSTANCE); ProxyServer.getInstance().getPluginManager().registerListener(this, ServiceMainListener.INSTANCE);
ProxyServer.getInstance().getPluginManager().registerCommand(this, ServiceCommand.INSTANCE); ProxyServer.getInstance().getPluginManager().registerCommand(this, ServiceCommand.INSTANCE);
BallAPI.getInstance().getSubConnection().sync().subscribe("HamsterService"); BallAPI.getInstance().subscribe("HamsterService");
} }
} }

19
hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/listener/BridgeListener.java
View File

@@ -1,6 +1,5 @@
package cn.hamster3.service.bungee.listener; 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.api.ServiceInfoAPI;
import cn.hamster3.service.bungee.event.MessageReceivedEvent; import cn.hamster3.service.bungee.event.MessageReceivedEvent;
import cn.hamster3.service.bungee.event.MessageSentEvent; import cn.hamster3.service.bungee.event.MessageSentEvent;
@@ -16,25 +15,23 @@ public class BridgeListener {
@Subscribe @Subscribe
public void onMessageSent(cn.hamster3.mc.plugin.ball.common.event.message.MessageSentEvent event) { 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( ProxyServer.getInstance().getPluginManager().callEvent(new MessageSentEvent(new ServiceMessageInfo(
ServiceInfoAPI.getSenderInfo(ballMessage.getSenderID()), ServiceInfoAPI.getSenderInfo(event.getSenderID()),
ballMessage.getReceiverID(), event.getReceiverID(),
event.getChannel(), event.getChannel(),
ballMessage.getAction(), event.getAction(),
ballMessage.getContent() event.getContent()
))); )));
} }
@Subscribe @Subscribe
public void onMessageReceived(cn.hamster3.mc.plugin.ball.common.event.message.MessageReceivedEvent event) { 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( ProxyServer.getInstance().getPluginManager().callEvent(new MessageReceivedEvent(new ServiceMessageInfo(
ServiceInfoAPI.getSenderInfo(ballMessage.getSenderID()), ServiceInfoAPI.getSenderInfo(event.getSenderID()),
ballMessage.getReceiverID(), event.getReceiverID(),
event.getChannel(), event.getChannel(),
ballMessage.getAction(), event.getAction(),
ballMessage.getContent() event.getContent()
))); )));
} }
} }

2
hamster-lobby/build.gradle
View File

@@ -1,4 +1,4 @@
version '1.1.0' version '1.1.1'
setArchivesBaseName("HamsterLobby") setArchivesBaseName("HamsterLobby")
dependencies { dependencies {

6
hamster-lobby/src/main/java/cn/hamster3/mc/plugin/lobby/bungee/listener/ServiceListener.java
View File

@@ -1,6 +1,5 @@
package cn.hamster3.mc.plugin.lobby.bungee.listener; 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.message.MessageReceivedEvent;
import cn.hamster3.mc.plugin.ball.common.event.server.ServerOfflineEvent; import cn.hamster3.mc.plugin.ball.common.event.server.ServerOfflineEvent;
import cn.hamster3.mc.plugin.lobby.bungee.LobbyPlugin; import cn.hamster3.mc.plugin.lobby.bungee.LobbyPlugin;
@@ -18,10 +17,9 @@ public class ServiceListener implements Listener {
if (!"HamsterLobby".equals(event.getChannel())) { if (!"HamsterLobby".equals(event.getChannel())) {
return; return;
} }
BallMessage ballMessage = event.getMessage(); switch (event.getAction()) {
switch (ballMessage.getAction()) {
case "registerLobby": { case "registerLobby": {
String senderID = ballMessage.getSenderID(); String senderID = event.getSenderID();
LobbyPlugin.LOBBY_SERVERS.add(senderID); LobbyPlugin.LOBBY_SERVERS.add(senderID);
LobbyPlugin.getInstance().getLogger().info("已添加大厅服务器: " + senderID); LobbyPlugin.getInstance().getLogger().info("已添加大厅服务器: " + senderID);
break; break;

2
hamster-tpa/build.gradle
View File

@@ -1,4 +1,4 @@
version = '1.1.0' version = '1.1.1'
setArchivesBaseName("HamsterTPA") setArchivesBaseName("HamsterTPA")
dependencies { dependencies {

10
hamster-tpa/src/main/java/cn/hamster3/mc/plugin/tpa/listener/MainListener.java
View File

@@ -1,6 +1,5 @@
package cn.hamster3.mc.plugin.tpa.listener; 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.ball.common.event.message.MessageReceivedEvent;
import cn.hamster3.mc.plugin.tpa.HamsterTPAPlugin; import cn.hamster3.mc.plugin.tpa.HamsterTPAPlugin;
import cn.hamster3.mc.plugin.tpa.core.DataManager; 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())) { if (!HamsterTPAPlugin.BALL_CHANNEL.equals(event.getChannel())) {
return; return;
} }
BallMessage ballMessage = event.getMessage(); switch (event.getAction()) {
switch (ballMessage.getAction()) {
case "setPlayerUseTime": { case "setPlayerUseTime": {
JsonObject object = ballMessage.getContentAsJsonObject(); JsonObject object = event.getContentAsJsonObject();
DataManager.setPlayerUseTime( DataManager.setPlayerUseTime(
UUID.fromString(object.get("uuid").getAsString()), UUID.fromString(object.get("uuid").getAsString()),
object.get("time").getAsLong(), object.get("time").getAsLong(),
@@ -33,7 +31,7 @@ public final class MainListener implements Listener {
break; break;
} }
case "sendTPA": { case "sendTPA": {
JsonObject object = ballMessage.getContentAsJsonObject(); JsonObject object = event.getContentAsJsonObject();
DataManager.sendTPA( DataManager.sendTPA(
UUID.fromString(object.get("sender").getAsString()), UUID.fromString(object.get("sender").getAsString()),
UUID.fromString(object.get("target").getAsString()), UUID.fromString(object.get("target").getAsString()),
@@ -43,7 +41,7 @@ public final class MainListener implements Listener {
break; break;
} }
case "clearTPAList": { case "clearTPAList": {
DataManager.clearTPAList(ballMessage.getContentAsUUID(), false); DataManager.clearTPAList(event.getContentAsUUID(), false);
break; break;
} }
case "": { case "": {