diff --git a/hamster-ball-bridge/build.gradle b/hamster-ball-bridge/build.gradle index c32c582..f1ba033 100644 --- a/hamster-ball-bridge/build.gradle +++ b/hamster-ball-bridge/build.gradle @@ -1,4 +1,4 @@ -version = '1.4.0' +version = '1.4.1' 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 27c2145..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 @@ -4,7 +4,7 @@ import cn.hamster3.mc.plugin.ball.common.api.BallAPI; import cn.hamster3.service.bukkit.command.ServiceCommand; import cn.hamster3.service.bukkit.hook.ServicePlaceholderHook; import cn.hamster3.service.bukkit.listener.ServiceMainListener; -import cn.hamster3.service.common.listener.BridgeListener; +import cn.hamster3.service.bukkit.listener.BridgeListener; import cn.hamster3.service.common.util.ServiceLogUtils; import org.bukkit.Bukkit; import org.bukkit.plugin.java.JavaPlugin; diff --git a/hamster-ball-bridge/src/main/java/cn/hamster3/service/common/listener/BridgeListener.java b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/listener/BridgeListener.java similarity index 97% rename from hamster-ball-bridge/src/main/java/cn/hamster3/service/common/listener/BridgeListener.java rename to hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/listener/BridgeListener.java index c864675..889318e 100644 --- a/hamster-ball-bridge/src/main/java/cn/hamster3/service/common/listener/BridgeListener.java +++ b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bukkit/listener/BridgeListener.java @@ -1,4 +1,4 @@ -package cn.hamster3.service.common.listener; +package cn.hamster3.service.bukkit.listener; import cn.hamster3.mc.plugin.ball.common.data.BallMessage; import cn.hamster3.service.bukkit.api.ServiceInfoAPI; 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 89ee77c..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 @@ -2,8 +2,8 @@ package cn.hamster3.service.bungee; import cn.hamster3.mc.plugin.ball.common.api.BallAPI; import cn.hamster3.service.bungee.command.ServiceCommand; +import cn.hamster3.service.bungee.listener.BridgeListener; import cn.hamster3.service.bungee.listener.ServiceMainListener; -import cn.hamster3.service.common.listener.BridgeListener; import cn.hamster3.service.common.util.ServiceLogUtils; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.plugin.Plugin; 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 new file mode 100644 index 0000000..2f6ac75 --- /dev/null +++ b/hamster-ball-bridge/src/main/java/cn/hamster3/service/bungee/listener/BridgeListener.java @@ -0,0 +1,40 @@ +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; +import cn.hamster3.service.common.entity.ServiceMessageInfo; +import com.google.common.eventbus.Subscribe; +import net.md_5.bungee.api.ProxyServer; + +public class BridgeListener { + public static final BridgeListener INSTANCE = new BridgeListener(); + + private 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(), + event.getChannel(), + ballMessage.getAction(), + ballMessage.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(), + event.getChannel(), + ballMessage.getAction(), + ballMessage.getContent() + ))); + } +}