From 92dc1d506b78a448bfb080d392d54b92041268a3 Mon Sep 17 00:00:00 2001 From: MiniDay <372403923@qq.com> Date: Sun, 17 Mar 2024 20:51:45 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=85=BC=E5=AE=B9=E4=BB=93=E9=BC=A0?= =?UTF-8?q?=E6=A0=B8=E5=BF=83=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 ++++---- .../plugin/ball/bukkit/listener/BallBukkitListener.java | 4 ++-- .../hamster3/mc/plugin/ball/bungee/HamsterBallPlugin.java | 4 ++++ .../plugin/ball/bungee/listener/BallBungeeListener.java | 4 ++-- .../cn/hamster3/mc/plugin/ball/common/api/BallAPI.java | 4 ++-- .../plugin/ball/common/event/operate/KickPlayerEvent.java | 2 +- .../mc/plugin/ball/common/listener/BallRedisListener.java | 2 +- .../mc/plugin/ball/common/thread/LockUpdateThread.java | 2 +- 8 files changed, 17 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index fa71896..6a95194 100644 --- a/README.md +++ b/README.md @@ -49,9 +49,9 @@ repositories { dependencies { // 对于 Bukkit 插件 - compileOnly("cn.hamster3.mc.plugin:ball-bukkit:1.6.0") + compileOnly("cn.hamster3.mc.plugin:ball-bukkit:1.6.1-SNAPSHOT") // 对于 BungeeCord 插件 - compileOnly("cn.hamster3.mc.plugin:ball-bungee:1.6.0") + compileOnly("cn.hamster3.mc.plugin:ball-bungee:1.6.1-SNAPSHOT") } ``` @@ -77,13 +77,13 @@ dependencies { cn.hamster3.mc.plugin ball-bukkit - 1.6.0 + 1.6.1-SNAPSHOT cn.hamster3.mc.plugin ball-bungee - 1.6.0 + 1.6.1-SNAPSHOT diff --git 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 index 6a61c8a..c9ec527 100644 --- 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 @@ -7,11 +7,11 @@ import cn.hamster3.mc.plugin.ball.common.entity.BallServerType; import cn.hamster3.mc.plugin.ball.common.event.operate.*; 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 net.kyori.adventure.audience.Audience; +import net.kyori.adventure.text.TextReplacementConfig; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.entity.Player; diff --git a/ball-bungee/src/main/java/cn/hamster3/mc/plugin/ball/bungee/HamsterBallPlugin.java b/ball-bungee/src/main/java/cn/hamster3/mc/plugin/ball/bungee/HamsterBallPlugin.java index 75f0480..3098d40 100644 --- a/ball-bungee/src/main/java/cn/hamster3/mc/plugin/ball/bungee/HamsterBallPlugin.java +++ b/ball-bungee/src/main/java/cn/hamster3/mc/plugin/ball/bungee/HamsterBallPlugin.java @@ -60,7 +60,11 @@ public class HamsterBallPlugin extends Plugin { try { BallBungeeCordAPI.getInstance().enable(); } catch (Exception e) { + getLogger().info("仓鼠球启动失败，原因：" + e.getMessage()); e.printStackTrace(); + getLogger().info("由于仓鼠球启动失败，服务器将立即关闭"); + ProxyServer.getInstance().stop("仓鼠球启动失败"); + return; } BallAPI.getInstance().getEventBus().register(BallBungeeListener.INSTANCE); logger.info("已注册监听器 BallBungeeListener"); diff --git a/ball-bungee/src/main/java/cn/hamster3/mc/plugin/ball/bungee/listener/BallBungeeListener.java b/ball-bungee/src/main/java/cn/hamster3/mc/plugin/ball/bungee/listener/BallBungeeListener.java index 878d004..109f1c0 100644 --- a/ball-bungee/src/main/java/cn/hamster3/mc/plugin/ball/bungee/listener/BallBungeeListener.java +++ b/ball-bungee/src/main/java/cn/hamster3/mc/plugin/ball/bungee/listener/BallBungeeListener.java @@ -5,9 +5,9 @@ import cn.hamster3.mc.plugin.ball.common.api.BallAPI; import cn.hamster3.mc.plugin.ball.common.entity.BallServerType; import cn.hamster3.mc.plugin.ball.common.event.operate.*; import cn.hamster3.mc.plugin.core.common.api.CoreAPI; -import cn.hamster3.mc.plugin.core.lib.net.kyori.adventure.audience.Audience; -import cn.hamster3.mc.plugin.core.lib.net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer; import com.google.common.eventbus.Subscribe; +import net.kyori.adventure.audience.Audience; +import net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.config.ServerInfo; diff --git a/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java index 1985911..0376010 100644 --- a/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java +++ b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java @@ -18,13 +18,13 @@ import cn.hamster3.mc.plugin.core.common.api.CoreAPI; import cn.hamster3.mc.plugin.core.common.config.ConfigSection; import cn.hamster3.mc.plugin.core.common.data.DisplayMessage; import cn.hamster3.mc.plugin.core.common.util.CoreUtils; -import cn.hamster3.mc.plugin.core.lib.net.kyori.adventure.text.Component; -import cn.hamster3.mc.plugin.core.lib.redis.clients.jedis.Jedis; import com.google.common.eventbus.AsyncEventBus; import com.google.common.eventbus.EventBus; import lombok.Getter; +import net.kyori.adventure.text.Component; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import redis.clients.jedis.Jedis; import javax.sql.DataSource; import java.sql.*; diff --git a/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/KickPlayerEvent.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/KickPlayerEvent.java index ba571da..2cc965c 100644 --- a/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/KickPlayerEvent.java +++ b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/KickPlayerEvent.java @@ -1,8 +1,8 @@ package cn.hamster3.mc.plugin.ball.common.event.operate; -import cn.hamster3.mc.plugin.core.lib.net.kyori.adventure.text.Component; import lombok.AllArgsConstructor; import lombok.Data; +import net.kyori.adventure.text.Component; import org.jetbrains.annotations.NotNull; import java.util.UUID; diff --git a/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallRedisListener.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallRedisListener.java index 6de5cfc..d18715b 100644 --- a/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallRedisListener.java +++ b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallRedisListener.java @@ -4,8 +4,8 @@ import cn.hamster3.mc.plugin.ball.common.api.BallAPI; import cn.hamster3.mc.plugin.ball.common.data.BallMessage; import cn.hamster3.mc.plugin.ball.common.event.message.MessageReceivedEvent; import cn.hamster3.mc.plugin.core.common.api.CoreAPI; -import cn.hamster3.mc.plugin.core.lib.redis.clients.jedis.JedisPubSub; import com.google.common.eventbus.EventBus; +import redis.clients.jedis.JedisPubSub; public class BallRedisListener extends JedisPubSub { public static final BallRedisListener INSTANCE = new BallRedisListener(); diff --git a/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/thread/LockUpdateThread.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/thread/LockUpdateThread.java index 2c7b147..f839426 100644 --- a/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/thread/LockUpdateThread.java +++ b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/thread/LockUpdateThread.java @@ -2,7 +2,7 @@ package cn.hamster3.mc.plugin.ball.common.thread; import cn.hamster3.mc.plugin.ball.common.api.BallAPI; import cn.hamster3.mc.plugin.core.common.api.CoreAPI; -import cn.hamster3.mc.plugin.core.lib.redis.clients.jedis.Jedis; +import redis.clients.jedis.Jedis; public class LockUpdateThread implements Runnable { public static final LockUpdateThread INSTANCE = new LockUpdateThread();