build: 更新版本号到 1.6.4

Merge branch 'dev'
fix(ball-common): 修复 jedis 线程占用问题
2024-03-27 10:37:33 +08:00 · 2024-03-27 10:36:18 +08:00 · 2024-03-27 09:41:56 +08:00 · 2024-03-26 22:25:26 +08:00 · 2024-03-26 22:23:34 +08:00 · 2024-03-26 19:00:55 +08:00
9 changed files with 74 additions and 64 deletions
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # [HamsterBall](https://git.airgame.net/MiniDay/hamster-ball)

-仓鼠球：一个基于 Redis 的 Minecraft 服务端通用消息中间件（原HamsterService）
+基于 Redis 的 Minecraft 服务端通用消息中间件

 该插件依赖于 [仓鼠核心](https://git.airgame.net/MiniDay/hamster-core)

@@ -49,9 +49,9 @@ repositories {

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

@@ -77,13 +77,13 @@ dependencies {
        <dependency>
            <groupId>cn.hamster3.mc.plugin</groupId>
            <artifactId>ball-bukkit</artifactId>
-            <version>1.6.2</version>
+            <version>1.6.4</version>
        </dependency>
        <!--对于 BungeeCord 插件-->
        <dependency>
            <groupId>cn.hamster3.mc.plugin</groupId>
            <artifactId>ball-bungee</artifactId>
-            <version>1.6.2</version>
+            <version>1.6.4</version>
        </dependency>
    </dependencies>
 </project>
--- a/ball-bukkit/src/main/resources/plugin.yml
+++ b/ball-bukkit/src/main/resources/plugin.yml
@@ -4,8 +4,15 @@ version: ${version}
 api-version: 1.13

 author: MiniDay
+description: ${description}
 website: https://git.airgame.net/MiniDay/hamster-ball
-description: 仓鼠球：一个基于 Redis 的 Minecraft 服务端通用消息中间件（原HamsterService）
+
+UPDATE_CHECKER:
+  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/

 load: STARTUP

--- a/ball-bukkit/src/main/resources/update.yml
+++ b/ball-bukkit/src/main/resources/update.yml
@@ -1,6 +0,0 @@
-version: ${version}
-CHECK_TYPE: GITEA_RELEASES
-GIT_BASE_URL: https://git.airgame.net
-GIT_REPO: MiniDay/hamster-ball
-GIT_TOKEN: a44a69a4d1b8601bf6091403247759cd28764d5e
-DOWNLOAD_URL: https://jenkins.airgame.net/job/opensource/job/hamster-ball/
--- a/ball-bungee/src/main/resources/bungee.yml
+++ b/ball-bungee/src/main/resources/bungee.yml
@@ -3,7 +3,15 @@ main: cn.hamster3.mc.plugin.ball.bungee.HamsterBallPlugin
 version: ${version}

 author: MiniDay
-description: 仓鼠球：一个基于 Redis 的 Minecraft 服务端通用消息中间件（原HamsterService）
+description: ${description}
+website: https://git.airgame.net/MiniDay/hamster-ball
+
+UPDATE_CHECKER:
+  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/

 depend:
  - HamsterCore
--- a/ball-bungee/src/main/resources/update.yml
+++ b/ball-bungee/src/main/resources/update.yml
@@ -1,6 +0,0 @@
-version: ${version}
-CHECK_TYPE: GITEA_RELEASES
-GIT_BASE_URL: https://git.airgame.net
-GIT_REPO: MiniDay/hamster-ball
-GIT_TOKEN: a44a69a4d1b8601bf6091403247759cd28764d5e
-DOWNLOAD_URL: https://jenkins.airgame.net/job/opensource/job/hamster-ball/
--- 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
@@ -105,6 +105,7 @@ public abstract class BallAPI {
    }

    protected void enable() throws SQLException, InterruptedException {
+        CoreAPI.getInstance().getExecutorService().submit(() -> redisSub.subscribe(BallRedisListener.INSTANCE, BALL_CHANNEL));
        try (Jedis jedis = CoreAPI.getInstance().getJedisPool().getResource()) {
            String key = "HamsterBall:ServerInfo:" + localServerInfo.getId();
            if (jedis.exists(key)) {
@@ -179,7 +180,6 @@ public abstract class BallAPI {
        }
        getLogger().info("从数据库中加载了 " + allServerInfo.size() + " 条服务器信息");
        getLogger().info("从数据库中加载了 " + allPlayerInfo.size() + " 条玩家信息");
-        subscribeRaw(BALL_CHANNEL);
    }

    protected void disable() throws SQLException, InterruptedException {
@@ -506,26 +506,29 @@ public abstract class BallAPI {
     * <p>
     * 会自动加上 config 中设置的频道前缀
     *
-     * @param channel 频道名称
+     * @param channels 频道名称
     */
-    public void subscribe(@NotNull String... channel) {
-        for (int i = 0; i < channel.length; i++) {
-            channel[i] = ballConfig.getChannelPrefix() + channel[i];
+    public void subscribe(@NotNull String... channels) {
+        for (int i = 0; i < channels.length; i++) {
+            channels[i] = ballConfig.getChannelPrefix() + channels[i];
        }
-        CoreAPI.getInstance().getExecutorService().submit(
-                () -> redisSub.subscribe(BallRedisListener.INSTANCE, channel)
-        );
+        subscribeRaw(channels);
    }

    /**
     * 忽略频道前缀配置，订阅 redis 消息频道
     *
-     * @param channel 频道名称
+     * @param channels 频道名称
     */
-    public void subscribeRaw(@NotNull String... channel) {
-        CoreAPI.getInstance().getExecutorService().submit(
-                () -> redisSub.subscribe(BallRedisListener.INSTANCE, channel)
-        );
+    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();
+//            }
+//        });
    }

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

    /**
@@ -544,22 +548,22 @@ public abstract class BallAPI {
     * <p>
     * 会自动加上 config 中设置的频道前缀
     *
-     * @param channel 频道名称
+     * @param channels 频道名称
     */
-    public void unsubscribe(@NotNull String... channel) {
-        for (int i = 0; i < channel.length; i++) {
-            channel[i] = ballConfig.getChannelPrefix() + channel[i];
+    public void unsubscribe(@NotNull String... channels) {
+        for (int i = 0; i < channels.length; i++) {
+            channels[i] = ballConfig.getChannelPrefix() + channels[i];
        }
-        BallRedisListener.INSTANCE.unsubscribe(channel);
+        unsubscribeRaw(channels);
    }

    /**
     * 忽略频道前缀配置，取消订阅 redis 消息频道
     *
-     * @param channel 频道名称
+     * @param channels 频道名称
     */
-    public void unsubscribeIgnorePrefix(@NotNull String... channel) {
-        BallRedisListener.INSTANCE.unsubscribe(channel);
+    public void unsubscribeRaw(@NotNull String... channels) {
+        BallRedisListener.INSTANCE.unsubscribe(channels);
    }

    /**
--- 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
@@ -15,19 +15,26 @@ public class BallRedisListener extends JedisPubSub {

    @Override
    public void onMessage(String channel, String message) {
-        if (channel.startsWith(BallAPI.getInstance().getBallConfig().getChannelPrefix())) {
-            channel = channel.substring(BallAPI.getInstance().getBallConfig().getChannelPrefix().length());
-        }
-        BallMessage ballMessage = CoreAPI.getInstance().getGson().fromJson(message, BallMessage.class);
-        BallAPI ballAPI = BallAPI.getInstance();
-        EventBus eventBus = ballAPI.getEventBus();
-        if (ballMessage.getReceiverType() != null && ballMessage.getReceiverType() != ballAPI.getLocalServerInfo().getType()) {
-            return;
-        }
-        if (ballMessage.getReceiverID() != null && !ballAPI.isLocalServer(ballMessage.getReceiverID())) {
-            return;
-        }
-        eventBus.post(new MessageReceivedEvent(channel, ballMessage));
+        CoreAPI.getInstance().getExecutorService().submit(() -> {
+            try {
+                String finalChannel = channel;
+                if (finalChannel.startsWith(BallAPI.getInstance().getBallConfig().getChannelPrefix())) {
+                    finalChannel = finalChannel.substring(BallAPI.getInstance().getBallConfig().getChannelPrefix().length());
+                }
+                BallMessage ballMessage = CoreAPI.getInstance().getGson().fromJson(message, BallMessage.class);
+                BallAPI ballAPI = BallAPI.getInstance();
+                EventBus eventBus = ballAPI.getEventBus();
+                if (ballMessage.getReceiverType() != null && ballMessage.getReceiverType() != ballAPI.getLocalServerInfo().getType()) {
+                    return;
+                }
+                if (ballMessage.getReceiverID() != null && !ballAPI.isLocalServer(ballMessage.getReceiverID())) {
+                    return;
+                }
+                eventBus.post(new MessageReceivedEvent(finalChannel, ballMessage));
+            } catch (Exception | Error e) {
+                e.printStackTrace();
+            }
+        });
    }

    @Override
--- a/ball-velocity/src/main/resources/update.yml
+++ b/ball-velocity/src/main/resources/update.yml
@@ -1,6 +1,5 @@
-version: ${version}
+VERSION: ${version}
 CHECK_TYPE: GITEA_RELEASES
 GIT_BASE_URL: https://git.airgame.net
 GIT_REPO: MiniDay/hamster-ball
-GIT_TOKEN: a44a69a4d1b8601bf6091403247759cd28764d5e
 DOWNLOAD_URL: https://jenkins.airgame.net/job/opensource/job/hamster-ball/
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,8 @@ plugins {
 }

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

 subprojects {
    apply {
@@ -16,6 +17,7 @@ subprojects {

    group = rootProject.group
    version = rootProject.version
+    description = rootProject.description

    repositories {
        maven("https://maven.airgame.net/maven-public/")
@@ -43,11 +45,6 @@ subprojects {
            from(rootProject.file("LICENSE"))
            duplicatesStrategy = DuplicatesStrategy.EXCLUDE
        }
-        processResources {
-            filesMatching("update.yml") {
-                expand(rootProject.properties)
-            }
-        }
        build {
            dependsOn(shadowJar)
        }
Author	SHA1	Message	Date
MiniDay	d38bd5e41f	build: 更新版本号到 1.6.4	2024-03-27 10:37:33 +08:00
MiniDay	52e25a0433	Merge branch 'dev'	2024-03-27 10:36:18 +08:00
MiniDay	cc33304ad4	fix(ball-common): 修复 jedis 线程占用问题	2024-03-27 09:41:56 +08:00
MiniDay	6d2abfa44b	build: 更改版本号	2024-03-26 22:25:26 +08:00
MiniDay	bc49510c46	Merge branch 'dev'	2024-03-26 22:23:34 +08:00
MiniDay	74f1a4557d	perf: 将 jedis 订阅频道处理代码移动至异步线程处理	2024-03-26 19:00:55 +08:00
MiniDay	84721e31ee	fix(ball-common): 修复当事件处理失败时直接会阻塞后续redis消息的bug	2024-03-26 17:25:49 +08:00
MiniDay	4e29246441	build: 优化构建脚本	2024-03-21 23:30:04 +08:00
MiniDay	aa0e94c7b7	docs: 修改描述	2024-03-19 16:22:36 +08:00
MiniDay	aac7248994	docs: 修改版本更新信息	2024-03-19 16:19:00 +08:00