4 Commits

Author SHA1 Message Date
6d2abfa44b build: 更改版本号 2024-03-26 22:25:26 +08:00
bc49510c46 Merge branch 'dev' 2024-03-26 22:23:34 +08:00
54461173c0 Merge pull request '修改版本号' (#4) from dev into master
Reviewed-on: #4
2024-03-19 10:53:48 +08:00
8dae4f7667 Merge pull request '添加 auto-register-game-server 功能' (#3) from dev into master
Reviewed-on: #3
2024-03-19 10:51:57 +08:00
3 changed files with 24 additions and 26 deletions

View File

@@ -49,9 +49,9 @@ repositories {
dependencies { dependencies {
// 对于 Bukkit 插件 // 对于 Bukkit 插件
compileOnly("cn.hamster3.mc.plugin:ball-bukkit:1.6.3-SNAPSHOT") compileOnly("cn.hamster3.mc.plugin:ball-bukkit:1.6.3")
// 对于 BungeeCord 插件 // 对于 BungeeCord 插件
compileOnly("cn.hamster3.mc.plugin:ball-bungee:1.6.3-SNAPSHOT") compileOnly("cn.hamster3.mc.plugin:ball-bungee:1.6.3")
} }
``` ```
@@ -77,13 +77,13 @@ dependencies {
<dependency> <dependency>
<groupId>cn.hamster3.mc.plugin</groupId> <groupId>cn.hamster3.mc.plugin</groupId>
<artifactId>ball-bukkit</artifactId> <artifactId>ball-bukkit</artifactId>
<version>1.6.3-SNAPSHOT</version> <version>1.6.3</version>
</dependency> </dependency>
<!--对于 BungeeCord 插件--> <!--对于 BungeeCord 插件-->
<dependency> <dependency>
<groupId>cn.hamster3.mc.plugin</groupId> <groupId>cn.hamster3.mc.plugin</groupId>
<artifactId>ball-bungee</artifactId> <artifactId>ball-bungee</artifactId>
<version>1.6.3-SNAPSHOT</version> <version>1.6.3</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

View File

@@ -105,7 +105,6 @@ public abstract class BallAPI {
} }
protected void enable() throws SQLException, InterruptedException { protected void enable() throws SQLException, InterruptedException {
CoreAPI.getInstance().getExecutorService().submit(() -> redisSub.subscribe(BallRedisListener.INSTANCE, BALL_CHANNEL));
try (Jedis jedis = CoreAPI.getInstance().getJedisPool().getResource()) { try (Jedis jedis = CoreAPI.getInstance().getJedisPool().getResource()) {
String key = "HamsterBall:ServerInfo:" + localServerInfo.getId(); String key = "HamsterBall:ServerInfo:" + localServerInfo.getId();
if (jedis.exists(key)) { if (jedis.exists(key)) {
@@ -180,6 +179,7 @@ public abstract class BallAPI {
} }
getLogger().info("从数据库中加载了 " + allServerInfo.size() + " 条服务器信息"); getLogger().info("从数据库中加载了 " + allServerInfo.size() + " 条服务器信息");
getLogger().info("从数据库中加载了 " + allPlayerInfo.size() + " 条玩家信息"); getLogger().info("从数据库中加载了 " + allPlayerInfo.size() + " 条玩家信息");
subscribeRaw(BALL_CHANNEL);
} }
protected void disable() throws SQLException, InterruptedException { protected void disable() throws SQLException, InterruptedException {
@@ -521,14 +521,13 @@ public abstract class BallAPI {
* @param channels 频道名称 * @param channels 频道名称
*/ */
public void subscribeRaw(@NotNull String... channels) { public void subscribeRaw(@NotNull String... channels) {
BallRedisListener.INSTANCE.subscribe(channels); CoreAPI.getInstance().getExecutorService().submit(() -> {
// CoreAPI.getInstance().getExecutorService().submit(() -> { try {
// try { redisSub.subscribe(BallRedisListener.INSTANCE, channels);
// redisSub.subscribe(BallRedisListener.INSTANCE, channels); } catch (Exception | Error e) {
// } catch (Exception | Error e) { e.printStackTrace();
// e.printStackTrace(); }
// } });
// });
} }
/** /**
@@ -537,10 +536,9 @@ public abstract class BallAPI {
* @param patterns 频道名称正则表达式 * @param patterns 频道名称正则表达式
*/ */
public void subscribePatterns(@NotNull String patterns) { public void subscribePatterns(@NotNull String patterns) {
BallRedisListener.INSTANCE.psubscribe(patterns); CoreAPI.getInstance().getExecutorService().submit(
// CoreAPI.getInstance().getExecutorService().submit( () -> redisSub.psubscribe(BallRedisListener.INSTANCE, patterns)
// () -> redisSub.psubscribe(BallRedisListener.INSTANCE, patterns) );
// );
} }
/** /**
@@ -548,22 +546,22 @@ public abstract class BallAPI {
* <p> * <p>
* 会自动加上 config 中设置的频道前缀 * 会自动加上 config 中设置的频道前缀
* *
* @param channels 频道名称 * @param channel 频道名称
*/ */
public void unsubscribe(@NotNull String... channels) { public void unsubscribe(@NotNull String... channel) {
for (int i = 0; i < channels.length; i++) { for (int i = 0; i < channel.length; i++) {
channels[i] = ballConfig.getChannelPrefix() + channels[i]; channel[i] = ballConfig.getChannelPrefix() + channel[i];
} }
unsubscribeRaw(channels); BallRedisListener.INSTANCE.unsubscribe(channel);
} }
/** /**
* 忽略频道前缀配置,取消订阅 redis 消息频道 * 忽略频道前缀配置,取消订阅 redis 消息频道
* *
* @param channels 频道名称 * @param channel 频道名称
*/ */
public void unsubscribeRaw(@NotNull String... channels) { public void unsubscribeIgnorePrefix(@NotNull String... channel) {
BallRedisListener.INSTANCE.unsubscribe(channels); BallRedisListener.INSTANCE.unsubscribe(channel);
} }
/** /**

View File

@@ -5,7 +5,7 @@ plugins {
} }
group = "cn.hamster3.mc.plugin" group = "cn.hamster3.mc.plugin"
version = "1.6.3-SNAPSHOT" version = "1.6.3"
description = "基于 Redis 的 Minecraft 服务端通用消息中间件" description = "基于 Redis 的 Minecraft 服务端通用消息中间件"
subprojects { subprojects {