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

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

@@ -1,4 +1,4 @@
version = '1.4.2'
version = '1.4.3'
setArchivesBaseName("HamsterBall-Bridge")
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 插件, 取消注册占位符.");
}
});
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 标签
*/
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);
}
/**

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;
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()
)));
}
}

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);
ProxyServer.getInstance().getPluginManager().registerListener(this, ServiceMainListener.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;
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()
)));
}
}