MiniDay/hamster-ball
1
0
Fork 0
Code Issues Pull Requests Actions Releases 9 Activity

feat: 添加 load-player-info-filter 配置选项

Browse Source
This commit is contained in:
叁只仓鼠
2024-02-24 16:38:31 +08:00
parent 53c582eb4d
commit 68ba097033
11 changed files with 100 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
README.md
View File

@@ -44,14 +44,16 @@
```groovy
// 添加仓库
repositories {
maven("https://maven.airgame.net/maven-public/")
maven {
url = uri("https://maven.airgame.net/maven-public/")
}
}
dependencies {
// 对于 Bukkit 插件
compileOnly("cn.hamster3.mc.plugin:ball-bukkit:1.5.1")
compileOnly("cn.hamster3.mc.plugin:ball-bukkit:1.5.2")
// 对于 BungeeCord 插件
compileOnly("cn.hamster3.mc.plugin:ball-bungee:1.5.1")
compileOnly("cn.hamster3.mc.plugin:ball-bungee:1.5.2")
}
```
@@ -77,13 +79,13 @@ dependencies {
<dependency>
<groupId>cn.hamster3.mc.plugin</groupId>
<artifactId>ball-bukkit</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</dependency>
<!--对于 BungeeCord 插件-->
<dependency>
<groupId>cn.hamster3.mc.plugin</groupId>
<artifactId>ball-bungee</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</dependency>
</dependencies>
</project>

4
ball-bukkit/build.gradle.kts
View File

@@ -1,10 +1,12 @@
@file:Suppress("VulnerableLibrariesLocal")
evaluationDependsOn(":ball-common")
dependencies {
implementation(project(":ball-common")) {
isTransitive = false
}
compileOnly("org.spigotmc:spigot-api:1.20.4-R0.1-SNAPSHOT")
compileOnly("org.spigotmc:spigot-api:1.18.2-R0.1-SNAPSHOT")
compileOnly("cn.hamster3.mc.plugin:core-bukkit:1.2.2")
compileOnly("me.clip:placeholderapi:2.11.5") {

1
ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/api/BallBukkitAPI.java
View File

@@ -59,6 +59,7 @@ public class BallBukkitAPI extends BallAPI {
config.getBoolean("debug", false),
config.getString("channel-prefix", "") + ":",
config.getBoolean("game-server-update-player-info", false),
config.getStringList("load-player-info-filter"),
serverInfo,
datasource
);

5
ball-bukkit/src/main/resources/config.yml
View File

@@ -14,6 +14,11 @@ channel-prefix: ""
# 则可以启用该功能以防止 UUID 紊乱的问题
game-server-update-player-info: false
# 该选项仅在 game-server-update-player-info 为 true 时有效
# 服务器在启动时只会从数据库中加载 proxy_server 为下列的字符串的玩家信息
load-player-info-filter:
- "BungeeCord"
# 本服务器信息
server-info:
# 服务器唯一识别码，最长 32 字符

1
ball-bungee/src/main/java/cn/hamster3/mc/plugin/ball/bungee/api/BallBungeeCordAPI.java
View File

@@ -56,6 +56,7 @@ public class BallBungeeCordAPI extends BallAPI {
config.getBoolean("debug", false),
config.getString("channel-prefix", "") + ":",
config.getBoolean("game-server-update-player-info", false),
config.getStringList("load-player-info-filter"),
serverInfo,
datasource
);

4
ball-bungee/src/main/resources/config.yml
View File

@@ -14,6 +14,10 @@ channel-prefix: ""
# 则可以启用该功能以防止 UUID 紊乱的问题
game-server-update-player-info: false
# 服务器在启动时只会从数据库中加载 proxy_server 为下列的字符串的玩家信息
load-player-info-filter:
"BungeeCord"
# 本服务器信息
server-info:
# 服务器唯一识别码，最长 32 字符

85
ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java
View File

@@ -122,24 +122,45 @@ public abstract class BallAPI {
}
}
}
try (PreparedStatement statement = connection.prepareStatement(
"SELECT * FROM `hamster_ball_player_info`;"
)) {
try (ResultSet set = statement.executeQuery()) {
while (set.next()) {
UUID uuid = UUID.fromString(set.getString("uuid"));
allPlayerInfo.put(uuid, new BallPlayerInfo(uuid,
set.getString("name"),
set.getString("game_server"),
set.getString("proxy_server"),
set.getBoolean("online")
));
if (getBallConfig().isGameServerUpdatePlayerInfo()) {
try (PreparedStatement statement = connection.prepareStatement(
"SELECT * FROM `hamster_ball_player_info` WHERE `proxy_server` IN (?);"
)) {
statement.setString(1, String.join(",", getBallConfig().getLoadPlayerInfoFilter()));
try (ResultSet set = statement.executeQuery()) {
while (set.next()) {
UUID uuid = UUID.fromString(set.getString("uuid"));
allPlayerInfo.put(uuid, new BallPlayerInfo(uuid,
set.getString("name"),
set.getString("game_server"),
set.getString("proxy_server"),
set.getBoolean("online")
));
}
}
}
} else {
try (PreparedStatement statement = connection.prepareStatement(
"SELECT * FROM `hamster_ball_player_info`;"
)) {
try (ResultSet set = statement.executeQuery()) {
while (set.next()) {
UUID uuid = UUID.fromString(set.getString("uuid"));
allPlayerInfo.put(uuid, new BallPlayerInfo(uuid,
set.getString("name"),
set.getString("game_server"),
set.getString("proxy_server"),
set.getBoolean("online")
));
}
}
}
}
}
getLogger().info("从数据库中加载了 " + allServerInfo.size() + " 条服务器信息");
getLogger().info("从数据库中加载了 " + allPlayerInfo.size() + " 条玩家信息");
redisPub.addListener(BallRedisListener.INSTANCE);
redisPub.sync().subscribe(BALL_CHANNEL);
subscribeIgnorePrefix(BALL_CHANNEL);
}
protected void disable() throws SQLException, InterruptedException {
@@ -462,6 +483,8 @@ public abstract class BallAPI {
/**
* 订阅 redis 消息频道
* <p>
* 会自动加上 config 中设置的频道前缀
*
* @param channel 频道名称
*/
@@ -473,7 +496,7 @@ public abstract class BallAPI {
}
/**
* 忽略仓鼠球频道前缀配置，订阅 redis 消息频道
* 忽略频道前缀配置，订阅 redis 消息频道
*
* @param channel 频道名称
*/
@@ -562,20 +585,9 @@ public abstract class BallAPI {
* @return 玩家信息
*/
public BallPlayerInfo getPlayerInfo(@NotNull String playerName) {
if (getBallConfig().isGameServerUpdatePlayerInfo()) {
for (BallPlayerInfo info : allPlayerInfo.values()) {
if (!info.getProxyServer().startsWith(BallAPI.getInstance().getBallConfig().getChannelPrefix())) {
continue;
}
if (info.getName().equalsIgnoreCase(playerName)) {
return info;
}
}
} else {
for (BallPlayerInfo info : allPlayerInfo.values()) {
if (info.getName().equalsIgnoreCase(playerName)) {
return info;
}
for (BallPlayerInfo info : allPlayerInfo.values()) {
if (info.getName().equalsIgnoreCase(playerName)) {
return info;
}
}
return null;
@@ -588,20 +600,9 @@ public abstract class BallAPI {
* @return 玩家信息
*/
public BallPlayerInfo getPlayerInfoExact(@NotNull String playerName) {
if (getBallConfig().isGameServerUpdatePlayerInfo()) {
for (BallPlayerInfo info : allPlayerInfo.values()) {
if (!info.getProxyServer().startsWith(BallAPI.getInstance().getBallConfig().getChannelPrefix())) {
continue;
}
if (info.getName().equals(playerName)) {
return info;
}
}
} else {
for (BallPlayerInfo info : allPlayerInfo.values()) {
if (info.getName().equals(playerName)) {
return info;
}
for (BallPlayerInfo info : allPlayerInfo.values()) {
if (info.getName().equals(playerName)) {
return info;
}
}
return null;

2
ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/config/BallConfig.java
View File

@@ -7,6 +7,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.sql.DataSource;
import java.util.List;
@Getter
@AllArgsConstructor
@@ -15,6 +16,7 @@ public class BallConfig {
@NotNull
private String channelPrefix;
private boolean gameServerUpdatePlayerInfo;
private List<String> loadPlayerInfoFilter;
@NotNull
private BallServerInfo serverInfo;
@Nullable

10
ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallDebugListener.java
View File

@@ -1,8 +1,11 @@
package cn.hamster3.mc.plugin.ball.common.listener;
import cn.hamster3.mc.plugin.ball.common.api.BallAPI;
import cn.hamster3.mc.plugin.ball.common.entity.BallPlayerInfo;
import cn.hamster3.mc.plugin.ball.common.event.message.MessageReceivedEvent;
import cn.hamster3.mc.plugin.ball.common.event.message.MessageSentEvent;
import cn.hamster3.mc.plugin.ball.common.event.player.BallPlayerInfoUpdateEvent;
import cn.hamster3.mc.plugin.core.common.api.CoreAPI;
import com.google.common.eventbus.Subscribe;
public class BallDebugListener {
@@ -20,4 +23,11 @@ public class BallDebugListener {
public void onMessageSent(MessageSentEvent event) {
BallAPI.getInstance().getLogger().info("发送了一条消息: " + event);
}
@Subscribe
public void onBallPlayerInfoUpdate(BallPlayerInfoUpdateEvent event) {
BallPlayerInfo playerInfo = event.getPlayerInfo();
String json = CoreAPI.getInstance().getGson().toJson(playerInfo);
BallAPI.getInstance().getLogger().info("更新了玩家 " + playerInfo.getName() + " 的信息: " + json);
}
}

44
ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallRedisListener.java
View File

@@ -10,6 +10,7 @@ import cn.hamster3.mc.plugin.ball.common.event.server.ServerOfflineEvent;
import cn.hamster3.mc.plugin.ball.common.event.server.ServerOnlineEvent;
import cn.hamster3.mc.plugin.core.common.api.CoreAPI;
import cn.hamster3.mc.plugin.core.lib.io.lettuce.core.pubsub.RedisPubSubListener;
import com.google.common.eventbus.EventBus;
public class BallRedisListener implements RedisPubSubListener<String, BallMessage> {
public static final BallRedisListener INSTANCE = new BallRedisListener();
@@ -22,104 +23,105 @@ public class BallRedisListener implements RedisPubSubListener<String, BallMessag
if (channel.startsWith(BallAPI.getInstance().getBallConfig().getChannelPrefix())) {
channel = channel.substring(BallAPI.getInstance().getBallConfig().getChannelPrefix().length());
}
BallAPI api = BallAPI.getInstance();
if (ballMessage.getReceiverType() != null && ballMessage.getReceiverType() != api.getLocalServerInfo().getType()) {
BallAPI ballAPI = BallAPI.getInstance();
EventBus eventBus = ballAPI.getEventBus();
if (ballMessage.getReceiverType() != null && ballMessage.getReceiverType() != ballAPI.getLocalServerInfo().getType()) {
return;
}
if (ballMessage.getReceiverID() != null && !api.isLocalServer(ballMessage.getReceiverID())) {
if (ballMessage.getReceiverID() != null && !ballAPI.isLocalServer(ballMessage.getReceiverID())) {
return;
}
api.getEventBus().post(new MessageReceivedEvent(channel, ballMessage));
eventBus.post(new MessageReceivedEvent(channel, ballMessage));
if (!BallAPI.BALL_CHANNEL.equals(channel)) {
return;
}
switch (BallActions.valueOf(ballMessage.getAction())) {
case BroadcastPlayerMessage: {
BroadcastPlayerMessageEvent event = CoreAPI.getInstance().getGson().fromJson(ballMessage.getContent(), BroadcastPlayerMessageEvent.class);
api.getEventBus().post(event);
eventBus.post(event);
break;
}
case DispatchConsoleCommand: {
DispatchConsoleCommandEvent event = CoreAPI.getInstance().getGson().fromJson(ballMessage.getContent(), DispatchConsoleCommandEvent.class);
api.getEventBus().post(event);
eventBus.post(event);
break;
}
case DispatchPlayerCommand: {
DispatchPlayerCommandEvent event = CoreAPI.getInstance().getGson().fromJson(ballMessage.getContent(), DispatchPlayerCommandEvent.class);
api.getEventBus().post(event);
eventBus.post(event);
break;
}
case KickPlayer: {
KickPlayerEvent event = CoreAPI.getInstance().getGson().fromJson(ballMessage.getContent(), KickPlayerEvent.class);
api.getEventBus().post(event);
eventBus.post(event);
break;
}
case SendMessageToPlayer: {
SendMessageToPlayerEvent event = CoreAPI.getInstance().getGson().fromJson(ballMessage.getContent(), SendMessageToPlayerEvent.class);
api.getEventBus().post(event);
eventBus.post(event);
break;
}
case SendPlayerToLocation: {
SendPlayerToLocationEvent event = CoreAPI.getInstance().getGson().fromJson(ballMessage.getContent(), SendPlayerToLocationEvent.class);
api.getEventBus().post(event);
eventBus.post(event);
break;
}
case SendPlayerToPlayer: {
SendPlayerToPlayerEvent event = CoreAPI.getInstance().getGson().fromJson(ballMessage.getContent(), SendPlayerToPlayerEvent.class);
api.getEventBus().post(event);
eventBus.post(event);
break;
}
case BallPlayerPreLogin: {
BallPlayerPreLoginEvent event = CoreAPI.getInstance().getGson().fromJson(ballMessage.getContent(), BallPlayerPreLoginEvent.class);
api.getEventBus().post(event);
eventBus.post(event);
break;
}
case BallPlayerLogin: {
BallPlayerLoginEvent event = CoreAPI.getInstance().getGson().fromJson(ballMessage.getContent(), BallPlayerLoginEvent.class);
api.getEventBus().post(event);
eventBus.post(event);
break;
}
case BallPlayerPostLogin: {
BallPlayerPostLoginEvent event = CoreAPI.getInstance().getGson().fromJson(ballMessage.getContent(), BallPlayerPostLoginEvent.class);
api.getEventBus().post(event);
eventBus.post(event);
break;
}
case BallPlayerPreConnectServer: {
BallPlayerPreConnectServerEvent event = CoreAPI.getInstance().getGson().fromJson(ballMessage.getContent(), BallPlayerPreConnectServerEvent.class);
api.getEventBus().post(event);
eventBus.post(event);
break;
}
case BallPlayerConnectServer: {
BallPlayerConnectServerEvent event = CoreAPI.getInstance().getGson().fromJson(ballMessage.getContent(), BallPlayerConnectServerEvent.class);
api.getEventBus().post(event);
eventBus.post(event);
break;
}
case BallPlayerPostConnectServer: {
BallPlayerPostConnectServerEvent event = CoreAPI.getInstance().getGson().fromJson(ballMessage.getContent(), BallPlayerPostConnectServerEvent.class);
api.getEventBus().post(event);
eventBus.post(event);
break;
}
case BallPlayerLogout: {
BallPlayerLogoutEvent event = CoreAPI.getInstance().getGson().fromJson(ballMessage.getContent(), BallPlayerLogoutEvent.class);
api.getEventBus().post(event);
eventBus.post(event);
break;
}
case BallPlayerInfoUpdate: {
BallPlayerInfoUpdateEvent event = CoreAPI.getInstance().getGson().fromJson(ballMessage.getContent(), BallPlayerInfoUpdateEvent.class);
api.getEventBus().post(event);
eventBus.post(event);
break;
}
case ServerOffline: {
ServerOfflineEvent event = CoreAPI.getInstance().getGson().fromJson(ballMessage.getContent(), ServerOfflineEvent.class);
api.getEventBus().post(event);
eventBus.post(event);
break;
}
case ServerOnline: {
ServerOnlineEvent event = CoreAPI.getInstance().getGson().fromJson(ballMessage.getContent(), ServerOnlineEvent.class);
api.getEventBus().post(event);
eventBus.post(event);
break;
}
}

2
build.gradle.kts
View File

@@ -5,7 +5,7 @@ plugins {
}
group = "cn.hamster3.mc.plugin"
version = "1.5.1"
version = "1.5.2"
subprojects {
apply {