docs: 修正文档

ci: 添加自动构建发布配置
feat: 使用 lettuce-core 连接 redis 提升稳定性
2025-07-03 02:38:54 +08:00 · 2025-07-03 02:37:36 +08:00 · 2025-07-03 02:36:20 +08:00 · 2025-03-23 00:46:54 +08:00 · 2025-01-26 15:01:15 +08:00
12 changed files with 109 additions and 76 deletions
--- a/.gitea/workflows/main.yaml
+++ b/.gitea/workflows/main.yaml
@@ -0,0 +1,29 @@
+name: Publish Project
+
+on:
+  push:
+    tags:
+      - "*"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: temurin
+          cache: gradle
+          cache-dependency-path: gradle/wrapper/gradle-wrapper.properties
+      - name: Build Project
+        env:
+          ORG_GRADLE_PROJECT_MAVEN_AIRGAME_USERNAME: ${{ secrets.MAVEN_AIRGAME_USERNAME }}
+          ORG_GRADLE_PROJECT_MAVEN_AIRGAME_PASSWORD: ${{ secrets.MAVEN_AIRGAME_PASSWORD }}
+        run: chmod +x gradlew && ./gradlew build publish --no-daemon
+      - name: Publish to Release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: build/*.jar
--- a/README.md
+++ b/README.md
@@ -11,8 +11,6 @@
 3. 命令行窗口中执行`./gradlew clean build`
 4. 构建成品在 `build` 文件夹

-也可访问我的[Jenkins网站](https://jenkins.airgame.net/job/opensource/job/hamster-ball/)获取最新版
-
 # 安装步骤

 1. 关闭服务器
@@ -49,9 +47,9 @@ repositories {

 dependencies {
    // 对于 Bukkit 插件
-    compileOnly("cn.hamster3.mc.plugin:ball-bukkit:1.7.0")
+    compileOnly("cn.hamster3.mc.plugin:ball-bukkit:1.8.0")
    // 对于 BungeeCord 插件
-    compileOnly("cn.hamster3.mc.plugin:ball-bungee:1.7.0")
+    compileOnly("cn.hamster3.mc.plugin:ball-bungee:1.8.0")
 }
 ```

@@ -77,13 +75,13 @@ dependencies {
        <dependency>
            <groupId>cn.hamster3.mc.plugin</groupId>
            <artifactId>ball-bukkit</artifactId>
-            <version>1.7.0</version>
+            <version>1.8.0</version>
        </dependency>
        <!--对于 BungeeCord 插件-->
        <dependency>
            <groupId>cn.hamster3.mc.plugin</groupId>
            <artifactId>ball-bungee</artifactId>
-            <version>1.7.0</version>
+            <version>1.8.0</version>
        </dependency>
    </dependencies>
 </project>
--- a/ball-bukkit/build.gradle.kts
+++ b/ball-bukkit/build.gradle.kts
@@ -20,6 +20,6 @@ tasks {
        archiveBaseName = "HamsterBall-Bukkit"
    }
    shadowJar {
-        destinationDirectory = rootProject.buildDir
+        destinationDirectory = rootProject.layout.buildDirectory
    }
 }
--- a/ball-bukkit/src/main/resources/plugin.yml
+++ b/ball-bukkit/src/main/resources/plugin.yml
@@ -12,7 +12,7 @@ UPDATE_CHECKER:
  CHECK_TYPE: GITEA_RELEASES
  GIT_BASE_URL: https://git.airgame.net
  GIT_REPO: MiniDay/hamster-ball
-  DOWNLOAD_URL: https://jenkins.airgame.net/job/opensource/job/hamster-ball/
+

 load: STARTUP

--- a/ball-bungee/build.gradle.kts
+++ b/ball-bungee/build.gradle.kts
@@ -18,6 +18,6 @@ tasks {
        archiveBaseName = "HamsterBall-BungeeCord"
    }
    shadowJar {
-        destinationDirectory = rootProject.buildDir
+        destinationDirectory = rootProject.layout.buildDirectory
    }
 }
--- a/ball-bungee/src/main/resources/bungee.yml
+++ b/ball-bungee/src/main/resources/bungee.yml
@@ -11,7 +11,6 @@ UPDATE_CHECKER:
  CHECK_TYPE: GITEA_RELEASES
  GIT_BASE_URL: https://git.airgame.net
  GIT_REPO: MiniDay/hamster-ball
-  DOWNLOAD_URL: https://jenkins.airgame.net/job/opensource/job/hamster-ball/

 depend:
  - HamsterCore
--- 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
@@ -20,11 +20,13 @@ import cn.hamster3.mc.plugin.core.common.data.DisplayMessage;
 import cn.hamster3.mc.plugin.core.common.util.CoreUtils;
 import com.google.common.eventbus.AsyncEventBus;
 import com.google.common.eventbus.EventBus;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
 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.*;
@@ -69,7 +71,7 @@ public abstract class BallAPI {
    private final Map<UUID, BallPlayerInfo> allPlayerInfo;

    @NotNull
-    private final Jedis redisSub;
+    private final StatefulRedisPubSubConnection<String, String> redisPubSub;
    @Nullable
    private ScheduledFuture<?> lockUpdater;

@@ -92,7 +94,7 @@ public abstract class BallAPI {
        eventBus.register(BallCommonListener.INSTANCE);
        allServerInfo = new ConcurrentHashMap<>();
        allPlayerInfo = new ConcurrentHashMap<>();
-        redisSub = CoreAPI.getInstance().getJedisPool().getResource();
+        redisPubSub = CoreAPI.getInstance().getRedisClient().connectPubSub();
        getLogger().info("频道前缀: " + ballConfig.getChannelPrefix());
        getLogger().info("启用子服更新玩家状态: " + ballConfig.isGameServerUpdatePlayerInfo());
        if (ballConfig.isGameServerUpdatePlayerInfo()) {
@@ -102,29 +104,31 @@ public abstract class BallAPI {
            getLogger().warning("已启用调试模式");
            eventBus.register(BallDebugListener.INSTANCE);
        }
-        CoreAPI.getInstance().getExecutorService().submit(() -> redisSub.subscribe(BallRedisListener.INSTANCE, BALL_CHANNEL));
+        redisPubSub.addListener(BallRedisListener.INSTANCE);
+        redisPubSub.sync().subscribe(BALL_CHANNEL);
    }

    protected void enable() throws SQLException, InterruptedException {
-        try (Jedis jedis = CoreAPI.getInstance().getJedisPool().getResource()) {
+        try (StatefulRedisConnection<String, String> connect = CoreAPI.getInstance().getRedisClient().connect()) {
+            RedisCommands<String, String> redis = connect.sync();
            String key = "HamsterBall:ServerInfo:" + localServerInfo.getId();
-            if (jedis.exists(key) && ballConfig.isSingletonServerID()) {
+            if (redis.exists(key) > 0 && ballConfig.isSingletonServerID()) {
                throw new IllegalStateException("已经有一个服务器占用了该 ID");
            }
-            jedis.hset(key, "id", localServerInfo.getId());
-            jedis.hset(key, "name", localServerInfo.getName());
-            jedis.hset(key, "type", localServerInfo.getType().name());
-            jedis.hset(key, "host", localServerInfo.getHost());
-            jedis.hset(key, "port", String.valueOf(localServerInfo.getPort()));
-            jedis.expire(key, 180);
+            redis.hset(key, "id", localServerInfo.getId());
+            redis.hset(key, "name", localServerInfo.getName());
+            redis.hset(key, "type", localServerInfo.getType().name());
+            redis.hset(key, "host", localServerInfo.getHost());
+            redis.hset(key, "port", String.valueOf(localServerInfo.getPort()));
+            redis.expire(key, 180);
            lockUpdater = CoreAPI.getInstance().getScheduledService().scheduleAtFixedRate(LockUpdateThread.INSTANCE, 1, 1, TimeUnit.MINUTES);
-            for (String serverInfoKey : jedis.keys("HamsterBall:ServerInfo:*")) {
+            for (String serverInfoKey : redis.keys("HamsterBall:ServerInfo:*")) {
                BallServerInfo info = new BallServerInfo(
-                        jedis.hget(serverInfoKey, "id"),
-                        jedis.hget(serverInfoKey, "name"),
-                        BallServerType.valueOf(jedis.hget(serverInfoKey, "type")),
-                        jedis.hget(serverInfoKey, "host"),
-                        Integer.parseInt(jedis.hget(serverInfoKey, "port"))
+                        redis.hget(serverInfoKey, "id"),
+                        redis.hget(serverInfoKey, "name"),
+                        BallServerType.valueOf(redis.hget(serverInfoKey, "type")),
+                        redis.hget(serverInfoKey, "host"),
+                        Integer.parseInt(redis.hget(serverInfoKey, "port"))
                );
                allServerInfo.put(info.getId(), info);
            }
@@ -192,9 +196,10 @@ public abstract class BallAPI {
        if (lockUpdater != null) {
            lockUpdater.cancel(true);
            lockUpdater = null;
-            try (Jedis jedis = CoreAPI.getInstance().getJedisPool().getResource()) {
+            try (StatefulRedisConnection<String, String> connect = CoreAPI.getInstance().getRedisClient().connect()) {
+                RedisCommands<String, String> redis = connect.sync();
                String key = "HamsterBall:ServerInfo:" + localServerInfo.getId();
-                jedis.del(key);
+                redis.del(key);
            }
        }
        try (Connection connection = getDatasource().getConnection()) {
@@ -206,7 +211,7 @@ public abstract class BallAPI {
                statement.executeUpdate();
            }
        }
-        redisSub.close();
+        redisPubSub.close();
    }

    /**
@@ -488,16 +493,12 @@ public abstract class BallAPI {
            channel = ballConfig.getChannelPrefix() + channel;
        }
        if (block) {
-            try (Jedis jedis = CoreAPI.getInstance().getJedisPool().getResource()) {
-                jedis.publish(channel, CoreAPI.getInstance().getGson().toJson(message));
-            }
+            redisPubSub.sync().publish(channel, CoreAPI.getInstance().getGson().toJson(message));
            eventBus.post(new MessageSentEvent(channel, message));
        } else {
            @NotNull String finalChannel = channel;
-            CoreAPI.getInstance().getExecutorService().submit(() -> {
-                try (Jedis jedis = CoreAPI.getInstance().getJedisPool().getResource()) {
-                    jedis.publish(finalChannel, CoreAPI.getInstance().getGson().toJson(message));
-                }
+            CoreAPI.getInstance().getExecutorService().execute(() -> {
+                redisPubSub.sync().publish(finalChannel, CoreAPI.getInstance().getGson().toJson(message));
                eventBus.post(new MessageSentEvent(finalChannel, message));
            });
        }
@@ -523,14 +524,7 @@ public abstract class BallAPI {
     * @param channels 频道名称
     */
    public void subscribeRaw(@NotNull String... channels) {
-        BallRedisListener.INSTANCE.subscribe(channels);
-//        CoreAPI.getInstance().getExecutorService().submit(() -> {
-//            try {
-//                redisSub.subscribe(BallRedisListener.INSTANCE, channels);
-//            } catch (Exception | Error e) {
-//                e.printStackTrace();
-//            }
-//        });
+        redisPubSub.sync().subscribe(channels);
    }

    /**
@@ -539,10 +533,7 @@ public abstract class BallAPI {
     * @param patterns 频道名称正则表达式
     */
    public void subscribePatterns(@NotNull String patterns) {
-        BallRedisListener.INSTANCE.psubscribe(patterns);
-//        CoreAPI.getInstance().getExecutorService().submit(
-//                () -> redisSub.psubscribe(BallRedisListener.INSTANCE, patterns)
-//        );
+        redisPubSub.sync().psubscribe(patterns);
    }

    /**
@@ -565,7 +556,7 @@ public abstract class BallAPI {
     * @param channels 频道名称
     */
    public void unsubscribeRaw(@NotNull String... channels) {
-        BallRedisListener.INSTANCE.unsubscribe(channels);
+        redisPubSub.sync().unsubscribe(channels);
    }

    /**
@@ -574,7 +565,7 @@ public abstract class BallAPI {
     * @param patterns 频道名称正则表达式
     */
    public void unsubscribePatterns(@NotNull String patterns) {
-        BallRedisListener.INSTANCE.punsubscribe(patterns);
+        redisPubSub.sync().punsubscribe(patterns);
    }

    @NotNull
--- a/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/entity/BallServerInfo.java
+++ b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/entity/BallServerInfo.java
@@ -46,7 +46,13 @@ public class BallServerInfo {
    public BallServerInfo(@NotNull ConfigSection config, @NotNull BallServerType type) {
        Map<String, String> env = System.getenv();
        id = env.getOrDefault("BALL_SERVER_ID", config.getString("id"));
+        if (id == null || id.isEmpty()) {
+            throw new IllegalArgumentException("id 不能为空");
+        }
        name = env.getOrDefault("BALL_SERVER_NAME", config.getString("name"));
+        if (name == null || name.isEmpty()) {
+            throw new IllegalArgumentException("name 不能为空");
+        }
        this.type = type;
        host = "0.0.0.0";
        port = 0;
--- 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
@@ -5,18 +5,17 @@ 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 com.google.common.eventbus.EventBus;
-import redis.clients.jedis.JedisPubSub;
+import io.lettuce.core.pubsub.RedisPubSubListener;

 import java.util.logging.Level;

-public class BallRedisListener extends JedisPubSub {
+public class BallRedisListener implements RedisPubSubListener<String, String> {
    public static final BallRedisListener INSTANCE = new BallRedisListener();

    private BallRedisListener() {
    }

-    @Override
-    public void onMessage(String channel, String message) {
+    public void handle(String channel, String message) {
        CoreAPI.getInstance().getExecutorService().submit(() -> {
            try {
                String finalChannel = channel;
@@ -40,27 +39,32 @@ public class BallRedisListener extends JedisPubSub {
    }

    @Override
-    public void onPMessage(String pattern, String channel, String message) {
-        onMessage(channel, message);
+    public void message(String channel, String message) {
+        handle(channel, message);
    }

    @Override
-    public void onSubscribe(String channel, int subscribedChannels) {
+    public void message(String pattern, String channel, String message) {
+        handle(channel, message);
+    }
+
+    @Override
+    public void subscribed(String channel, long count) {
        BallAPI.getInstance().getLogger().info("已订阅 redis 频道 " + channel);
    }

    @Override
-    public void onUnsubscribe(String channel, int subscribedChannels) {
-        BallAPI.getInstance().getLogger().info("已取消订阅 redis 频道 " + channel);
-    }
-
-    @Override
-    public void onPSubscribe(String pattern, int subscribedChannels) {
+    public void psubscribed(String pattern, long count) {
        BallAPI.getInstance().getLogger().info("已订阅 redis 频道（正则） " + pattern);
    }

    @Override
-    public void onPUnsubscribe(String pattern, int subscribedChannels) {
+    public void unsubscribed(String channel, long count) {
+        BallAPI.getInstance().getLogger().info("已取消订阅 redis 频道 " + channel);
+    }
+
+    @Override
+    public void punsubscribed(String pattern, long count) {
        BallAPI.getInstance().getLogger().info("已取消订阅 redis 频道（正则） " + pattern);
    }
 }
--- 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,8 @@ 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 redis.clients.jedis.Jedis;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;

 public class LockUpdateThread implements Runnable {
    public static final LockUpdateThread INSTANCE = new LockUpdateThread();
@@ -13,8 +14,9 @@ public class LockUpdateThread implements Runnable {
    @Override
    public void run() {
        String key = "HamsterBall:ServerInfo:" + BallAPI.getInstance().getLocalServerInfo().getId();
-        try (Jedis jedis = CoreAPI.getInstance().getJedisPool().getResource()) {
-            jedis.expire(key, 180);
+        try (StatefulRedisConnection<String, String> connect = CoreAPI.getInstance().getRedisClient().connect()) {
+            RedisCommands<String, String> redis = connect.sync();
+            redis.expire(key, 180);
        }
    }
 }
--- a/ball-velocity/src/main/resources/update.yml
+++ b/ball-velocity/src/main/resources/update.yml
@@ -2,4 +2,3 @@ VERSION: ${version}
 CHECK_TYPE: GITEA_RELEASES
 GIT_BASE_URL: https://git.airgame.net
 GIT_REPO: MiniDay/hamster-ball
-DOWNLOAD_URL: https://jenkins.airgame.net/job/opensource/job/hamster-ball/
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,18 +1,24 @@
+buildscript {
+    repositories {
+        maven("https://maven.airgame.net/maven-public/")
+    }
+}
+
 plugins {
    id("java-library")
    id("maven-publish")
-    id("com.github.johnrengelman.shadow") version "8+"
+    id("com.gradleup.shadow") version "8.3.6"
 }

 group = "cn.hamster3.mc.plugin"
-version = "1.7.1"
+version = "1.8.0"
 description = "基于 Redis 的 Minecraft 服务端通用消息中间件"

 subprojects {
    apply {
        plugin("java-library")
        plugin("maven-publish")
-        plugin("com.github.johnrengelman.shadow")
+        plugin("com.gradleup.shadow")
    }

    group = rootProject.group
@@ -59,10 +65,9 @@ subprojects {
        repositories {
            maven {
                url = uri("https://maven.airgame.net/public")
-
                credentials {
-                    username = rootProject.properties.getOrDefault("maven_username", "").toString()
-                    password = rootProject.properties.getOrDefault("maven_password", "").toString()
+                    username = findProperty("MAVEN_AIRGAME_USERNAME")?.toString() ?: ""
+                    password = findProperty("MAVEN_AIRGAME_PASSWORD")?.toString() ?: ""
                }
            }
        }
Author	SHA1	Message	Date
MiniDay	1e0417c814	docs: 修正文档 All checks were successful Publish Project / build (push) Successful in 2m17s Details	2025-07-03 02:38:54 +08:00
MiniDay	c3b2248c60	ci: 添加自动构建发布配置	2025-07-03 02:37:36 +08:00
MiniDay	25828267f6	feat: 使用 lettuce-core 连接 redis 提升稳定性	2025-07-03 02:36:20 +08:00
MiniDay	95c0a23857	build: 优化构建脚本	2025-03-23 00:46:54 +08:00
MiniDay	00dbcba628	fix(ball-common): 提前对服务器 id 和 name 进行空判断	2025-01-26 15:01:15 +08:00