feat: 使用 guava 的 EventBus

2023-11-11 17:54:40 +08:00
parent 167e845bae
commit a5c2eec5e5
41 changed files with 642 additions and 864 deletions
--- a/ball-bukkit/build.gradle.kts
+++ b/ball-bukkit/build.gradle.kts
@@ -1,4 +1,4 @@
-@file:Suppress("GradlePackageVersionRange")
+@file:Suppress("VulnerableLibrariesLocal", "GradlePackageVersionRange", "GradlePackageUpdate")

 evaluationDependsOn(":ball-common")

@@ -8,8 +8,8 @@ dependencies {

    compileOnly("cn.hamster3.mc.plugin:core-bukkit:+")
    compileOnly("me.clip:placeholderapi:+") { isTransitive = false }
-    // https://mvnrepository.com/artifact/io.lettuce/lettuce-core
-    implementation("io.lettuce:lettuce-core:6.2.6.RELEASE")
+
+    implementation("io.lettuce:lettuce-core:+")
 }

 tasks {
--- a/ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/HamsterBallPlugin.java
+++ b/ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/HamsterBallPlugin.java
@@ -4,6 +4,7 @@ import cn.hamster3.mc.plugin.ball.bukkit.api.BallBukkitAPI;
 import cn.hamster3.mc.plugin.ball.bukkit.hook.PlaceholderHook;
 import cn.hamster3.mc.plugin.ball.bukkit.listener.BallBukkitListener;
 import cn.hamster3.mc.plugin.ball.common.api.BallAPI;
+import cn.hamster3.mc.plugin.ball.common.event.BallActions;
 import cn.hamster3.mc.plugin.ball.common.event.server.ServerOnlineEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -55,25 +56,18 @@ public class HamsterBallPlugin extends JavaPlugin {
        } catch (Exception e) {
            e.printStackTrace();
        }
-        if (!BallAPI.getInstance().isEnabled()) {
-            sync(() -> {
-                logger.info("由于 HamsterBall 未能成功连接, 服务器将立即关闭");
-                Bukkit.shutdown();
-            });
-            return;
-        }
        Bukkit.getPluginManager().registerEvents(BallBukkitListener.INSTANCE, this);
+        BallAPI.getInstance().getEventBus().register(BallBukkitListener.INSTANCE);
        logger.info("已注册 BallBukkitListener");
-        BallAPI.getInstance().sendBallMessage(
-                BallAPI.BALL_CHANNEL,
-                ServerOnlineEvent.ACTION,
-                new ServerOnlineEvent(BallAPI.getInstance().getLocalServerInfo())
-        );
        sync(() -> {
            if (Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")) {
                PlaceholderHook.INSTANCE.register();
                logger.info("已挂载 PlaceholderAPI 变量");
            }
+            BallAPI.getInstance().sendBallMessage(
+                    BallAPI.BALL_CHANNEL, BallActions.ServerOnline.name(),
+                    new ServerOnlineEvent(BallAPI.getInstance().getLocalServerInfo())
+            );
        });
        long time = System.currentTimeMillis() - start;
        logger.info("仓鼠球启动完成，总计耗时 " + time + " ms");
--- a/ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/listener/BallBukkitListener.java
+++ b/ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/listener/BallBukkitListener.java
@@ -3,15 +3,14 @@ package cn.hamster3.mc.plugin.ball.bukkit.listener;
 import cn.hamster3.mc.plugin.ball.bukkit.HamsterBallPlugin;
 import cn.hamster3.mc.plugin.ball.bukkit.data.BukkitLocation;
 import cn.hamster3.mc.plugin.ball.common.api.BallAPI;
-import cn.hamster3.mc.plugin.ball.common.data.BallMessageInfo;
 import cn.hamster3.mc.plugin.ball.common.entity.BallServerType;
 import cn.hamster3.mc.plugin.ball.common.event.operate.*;
-import cn.hamster3.mc.plugin.ball.common.listener.BallListener;
 import cn.hamster3.mc.plugin.core.bukkit.api.CoreBukkitAPI;
 import cn.hamster3.mc.plugin.core.common.api.CoreAPI;
 import cn.hamster3.mc.plugin.core.common.data.DisplayMessage;
 import cn.hamster3.mc.plugin.core.lib.net.kyori.adventure.audience.Audience;
 import cn.hamster3.mc.plugin.core.lib.net.kyori.adventure.text.TextReplacementConfig;
+import com.google.common.eventbus.Subscribe;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.bukkit.Bukkit;
@@ -33,7 +32,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.UUID;

-public class BallBukkitListener implements Listener, BallListener {
+public class BallBukkitListener implements Listener {
    public static final BallBukkitListener INSTANCE = new BallBukkitListener();

    private final HashMap<UUID, ToLocation> playerToLocation = new HashMap<>();
@@ -42,108 +41,6 @@ public class BallBukkitListener implements Listener, BallListener {
    private BallBukkitListener() {
    }

-    @Override
-    public void onMessageReceived(@NotNull BallMessageInfo info) {
-        switch (info.getAction()) {
-            case BroadcastPlayerMessageEvent.ACTION: {
-                BroadcastPlayerMessageEvent event = CoreAPI.getInstance().getGson().fromJson(info.getContent(), BroadcastPlayerMessageEvent.class);
-                DisplayMessage message = event.getMessage();
-                Audience audience = CoreAPI.getInstance().getAudienceProvider().all();
-                message.show(audience);
-                break;
-            }
-            case DispatchConsoleCommandEvent.ACTION: {
-                DispatchConsoleCommandEvent event = CoreAPI.getInstance().getGson().fromJson(info.getContent(), DispatchConsoleCommandEvent.class);
-                if (event.getType() != null && event.getType() != BallServerType.GAME) {
-                    return;
-                }
-                if (event.getServerID() != null && !BallAPI.getInstance().isLocalServer(event.getServerID())) {
-                    return;
-                }
-                Bukkit.dispatchCommand(Bukkit.getConsoleSender(), event.getCommand());
-                break;
-            }
-            case DispatchPlayerCommandEvent.ACTION: {
-                DispatchPlayerCommandEvent event = CoreAPI.getInstance().getGson().fromJson(info.getContent(), DispatchPlayerCommandEvent.class);
-                if (event.getType() != null && event.getType() != BallServerType.GAME) {
-                    return;
-                }
-                if (event.getUuid() != null) {
-                    Player player = Bukkit.getPlayer(event.getUuid());
-                    if (player == null) {
-                        return;
-                    }
-                    Bukkit.dispatchCommand(player, event.getCommand());
-                    return;
-                }
-                for (Player player : Bukkit.getOnlinePlayers()) {
-                    Bukkit.dispatchCommand(player, event.getCommand());
-                }
-                break;
-            }
-            case SendPlayerToLocationEvent.ACTION: {
-                SendPlayerToLocationEvent event = CoreAPI.getInstance().getGson().fromJson(info.getContent(), SendPlayerToLocationEvent.class);
-                BukkitLocation location = new BukkitLocation(event.getLocation());
-                if (BallAPI.getInstance().isLocalServer(location.getServerID())) {
-                    for (UUID uuid : event.getSendPlayerUUID()) {
-                        Player player = Bukkit.getPlayer(uuid);
-                        if (player != null) {
-                            HamsterBallPlugin.sync(() -> {
-                                player.teleport(location.toBukkitLocation());
-                                if (event.getDoneMessage() != null) {
-                                    Audience audience = CoreBukkitAPI.getInstance().getAudienceProvider().player(player);
-                                    event.getDoneMessage().show(audience);
-                                }
-                            });
-                        } else {
-                            playerToLocation.put(uuid, new ToLocation(location.toBukkitLocation(), event.getDoneMessage()));
-                        }
-                    }
-                }
-                break;
-            }
-            case SendPlayerToPlayerEvent.ACTION: {
-                SendPlayerToPlayerEvent event = CoreAPI.getInstance().getGson().fromJson(info.getContent(), SendPlayerToPlayerEvent.class);
-                Player toPlayer = Bukkit.getPlayer(event.getToPlayerUUID());
-                if (toPlayer == null) {
-                    break;
-                }
-                Location location = toPlayer.getLocation();
-                for (UUID uuid : event.getSendPlayerUUID()) {
-                    Player sendPlayer = Bukkit.getPlayer(uuid);
-                    if (sendPlayer != null) {
-                        HamsterBallPlugin.sync(() -> {
-                            sendPlayer.teleport(location);
-                            if (event.getDoneMessage() != null) {
-                                Audience audience = CoreBukkitAPI.getInstance().getAudienceProvider().player(sendPlayer);
-                                event.getDoneMessage().show(audience, TextReplacementConfig.builder()
-                                        .matchLiteral("%player_name%")
-                                        .replacement(toPlayer.getName())
-                                        .build());
-                            }
-                            if (event.getDoneTargetMessage() != null) {
-                                Audience audience = CoreBukkitAPI.getInstance().getAudienceProvider().player(toPlayer);
-                                event.getDoneTargetMessage().show(audience, TextReplacementConfig.builder()
-                                        .matchLiteral("%player_name%")
-                                        .replacement(sendPlayer.getName())
-                                        .build());
-                            }
-                        });
-                    } else {
-                        ToPlayer data = new ToPlayer(
-                                toPlayer.getUniqueId(),
-                                toPlayer.getLocation(),
-                                event.getDoneMessage(),
-                                event.getDoneTargetMessage()
-                        );
-                        playerToPlayer.put(uuid, data);
-                    }
-                }
-                break;
-            }
-        }
-    }
-
    @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGH)
    public void onPlayerJoin(PlayerJoinEvent event) {
        Player player = event.getPlayer();
@@ -189,6 +86,103 @@ public class BallBukkitListener implements Listener, BallListener {
        });
    }

+    @Subscribe
+    public void onBroadcastPlayerMessage(BroadcastPlayerMessageEvent event) {
+        DisplayMessage message = event.getMessage();
+        Audience audience = CoreAPI.getInstance().getAudienceProvider().all();
+        message.show(audience);
+    }
+
+    @Subscribe
+    public void onDispatchConsoleCommand(DispatchConsoleCommandEvent event) {
+        if (event.getType() != null && event.getType() != BallServerType.GAME) {
+            return;
+        }
+        if (event.getServerID() != null && !BallAPI.getInstance().isLocalServer(event.getServerID())) {
+            return;
+        }
+        Bukkit.dispatchCommand(Bukkit.getConsoleSender(), event.getCommand());
+    }
+
+    @Subscribe
+    public void onDispatchPlayerCommand(DispatchPlayerCommandEvent event) {
+        if (event.getType() != null && event.getType() != BallServerType.GAME) {
+            return;
+        }
+        if (event.getUuid() != null) {
+            Player player = Bukkit.getPlayer(event.getUuid());
+            if (player == null) {
+                return;
+            }
+            Bukkit.dispatchCommand(player, event.getCommand());
+            return;
+        }
+        for (Player player : Bukkit.getOnlinePlayers()) {
+            Bukkit.dispatchCommand(player, event.getCommand());
+        }
+    }
+
+    @Subscribe
+    public void onSendPlayerToLocation(SendPlayerToLocationEvent event) {
+        BukkitLocation location = new BukkitLocation(event.getLocation());
+        if (!BallAPI.getInstance().isLocalServer(location.getServerID())) {
+            return;
+        }
+        for (UUID uuid : event.getSendPlayerUUID()) {
+            Player player = Bukkit.getPlayer(uuid);
+            if (player != null) {
+                HamsterBallPlugin.sync(() -> {
+                    player.teleport(location.toBukkitLocation());
+                    if (event.getDoneMessage() != null) {
+                        Audience audience = CoreBukkitAPI.getInstance().getAudienceProvider().player(player);
+                        event.getDoneMessage().show(audience);
+                    }
+                });
+            } else {
+                playerToLocation.put(uuid, new ToLocation(location.toBukkitLocation(), event.getDoneMessage()));
+            }
+        }
+    }
+
+    @Subscribe
+    public void onSendPlayerToPlayer(SendPlayerToPlayerEvent event) {
+        Player toPlayer = Bukkit.getPlayer(event.getToPlayerUUID());
+        if (toPlayer == null) {
+            return;
+        }
+        Location location = toPlayer.getLocation();
+        for (UUID uuid : event.getSendPlayerUUID()) {
+            Player sendPlayer = Bukkit.getPlayer(uuid);
+            if (sendPlayer != null) {
+                HamsterBallPlugin.sync(() -> {
+                    sendPlayer.teleport(location);
+                    if (event.getDoneMessage() != null) {
+                        Audience audience = CoreBukkitAPI.getInstance().getAudienceProvider().player(sendPlayer);
+                        event.getDoneMessage().show(audience, TextReplacementConfig.builder()
+                                .matchLiteral("%player_name%")
+                                .replacement(toPlayer.getName())
+                                .build());
+                    }
+                    if (event.getDoneTargetMessage() != null) {
+                        Audience audience = CoreBukkitAPI.getInstance().getAudienceProvider().player(toPlayer);
+                        event.getDoneTargetMessage().show(audience, TextReplacementConfig.builder()
+                                .matchLiteral("%player_name%")
+                                .replacement(sendPlayer.getName())
+                                .build());
+                    }
+                });
+            } else {
+                ToPlayer data = new ToPlayer(
+                        toPlayer.getUniqueId(),
+                        toPlayer.getLocation(),
+                        event.getDoneMessage(),
+                        event.getDoneTargetMessage()
+                );
+                playerToPlayer.put(uuid, data);
+            }
+        }
+    }
+
    @NotNull
    private List<DisplayMessage> getCachedPlayerMessage(@NotNull UUID uuid) throws SQLException {
        ArrayList<DisplayMessage> list = new ArrayList<>();