From a44f0be762ab4b2da345525a1adce2957caf905b Mon Sep 17 00:00:00 2001 From: MiniDay <372403923@qq.com> Date: Fri, 20 Jan 2023 11:05:12 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E9=83=A8?= =?UTF-8?q?=E5=88=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bukkit/listener/BallBukkitListener.java | 2 +- .../listener/BallBungeeCordListener.java | 2 +- .../common/listener/BallDebugListener.java | 2 +- .../ball/common/listener/BallListener.java | 36 +++++++++---------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/listener/BallBukkitListener.java b/hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/listener/BallBukkitListener.java index e100ed4..0aa577d 100644 --- a/hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/listener/BallBukkitListener.java +++ b/hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/listener/BallBukkitListener.java @@ -28,7 +28,7 @@ import org.jetbrains.annotations.NotNull; import java.util.HashMap; import java.util.UUID; -public class BallBukkitListener extends BallListener implements Listener { +public class BallBukkitListener implements Listener, BallListener { public static final BallBukkitListener INSTANCE = new BallBukkitListener(); private final HashMap> playerToLocation = new HashMap<>(); diff --git a/hamster-ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/listener/BallBungeeCordListener.java b/hamster-ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/listener/BallBungeeCordListener.java index 7c0918c..1cce9e8 100644 --- a/hamster-ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/listener/BallBungeeCordListener.java +++ b/hamster-ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/listener/BallBungeeCordListener.java @@ -31,7 +31,7 @@ import org.jetbrains.annotations.NotNull; import java.util.Map; import java.util.UUID; -public final class BallBungeeCordListener extends BallListener implements Listener { +public final class BallBungeeCordListener implements Listener, BallListener { public static final BallBungeeCordListener INSTANCE = new BallBungeeCordListener(); private BallBungeeCordListener() { diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallDebugListener.java b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallDebugListener.java index 2ab6ee3..da0fea9 100644 --- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallDebugListener.java +++ b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallDebugListener.java @@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull; import java.util.logging.Level; -public final class BallDebugListener extends BallListener { +public final class BallDebugListener implements BallListener { public static final BallDebugListener INSTANCE = new BallDebugListener(); private BallDebugListener() { diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallListener.java b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallListener.java index fcc5bf1..b0b48ac 100644 --- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallListener.java +++ b/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallListener.java @@ -6,62 +6,62 @@ import cn.hamster3.mc.plugin.ball.common.event.server.ServerOfflineEvent; import cn.hamster3.mc.plugin.ball.common.event.server.ServerOnlineEvent; import org.jetbrains.annotations.NotNull; -public abstract class BallListener { +public interface BallListener { /** * 该监听器的执行优先级 * * @return 优先级 */ - public ListenerPriority getPriority() { + default ListenerPriority getPriority() { return ListenerPriority.NORMAL; } - public void onConnectActive() { + default void onConnectActive() { } - public void onMessageReceived(@NotNull BallMessageInfo event) { + default void onMessageReceived(@NotNull BallMessageInfo event) { } - public void onMessageSend(@NotNull BallMessageInfo event) { + default void onMessageSend(@NotNull BallMessageInfo event) { } - public void onConnectException(Throwable throwable) { + default void onConnectException(Throwable throwable) { } - public void onServiceDead() { + default void onServiceDead() { } - public void onBallPlayerPreLogin(@NotNull BallPlayerPreLoginEvent event) { + default void onBallPlayerPreLogin(@NotNull BallPlayerPreLoginEvent event) { } - public void onBallPlayerLogin(@NotNull BallPlayerLoginEvent event) { + default void onBallPlayerLogin(@NotNull BallPlayerLoginEvent event) { } - public void onBallPlayerPostLogin(@NotNull BallPlayerPostLoginEvent event) { + default void onBallPlayerPostLogin(@NotNull BallPlayerPostLoginEvent event) { } - public void onBallPlayerPreConnectServer(@NotNull BallPlayerPreConnectServerEvent event) { + default void onBallPlayerPreConnectServer(@NotNull BallPlayerPreConnectServerEvent event) { } - public void onBallPlayerConnectServer(@NotNull BallPlayerConnectServerEvent event) { + default void onBallPlayerConnectServer(@NotNull BallPlayerConnectServerEvent event) { } - public void onBallPlayerPostConnectServer(@NotNull BallPlayerPostConnectServerEvent event) { + default void onBallPlayerPostConnectServer(@NotNull BallPlayerPostConnectServerEvent event) { } - public void onBallPlayerLogout(@NotNull BallPlayerLogoutEvent event) { + default void onBallPlayerLogout(@NotNull BallPlayerLogoutEvent event) { } - public void onBallPlayerInfoUpdate(@NotNull BallPlayerInfoUpdateEvent event) { + default void onBallPlayerInfoUpdate(@NotNull BallPlayerInfoUpdateEvent event) { } - public void onBallPlayerChat(@NotNull BallPlayerChatEvent event) { + default void onBallPlayerChat(@NotNull BallPlayerChatEvent event) { } - public void onServerOnline(@NotNull ServerOnlineEvent event) { + default void onServerOnline(@NotNull ServerOnlineEvent event) { } - public void onServerOffline(@NotNull ServerOfflineEvent event) { + default void onServerOffline(@NotNull ServerOfflineEvent event) { } }