feat: 兼容仓鼠核心升级

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 {
         <dependency>
             <groupId>cn.hamster3.mc.plugin</groupId>
             <artifactId>ball-bukkit</artifactId>
-            <version>1.6.0</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
         <!--对于 BungeeCord 插件-->
         <dependency>
             <groupId>cn.hamster3.mc.plugin</groupId>
             <artifactId>ball-bungee</artifactId>
-            <version>1.6.0</version>
+            <version>1.6.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>

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;

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");

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;

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.*;

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;

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

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