From 503ba16c6ec5fe11ee72369c56ee99c4e311c534 Mon Sep 17 00:00:00 2001 From: MiniDay <372403923@qq.com> Date: Wed, 31 May 2023 06:51:52 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=85=81=E8=AE=B8=E4=BB=8E=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E5=8F=98=E9=87=8F=E4=B8=AD=E8=AF=BB=E5=8F=96=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 18 ++++++++++-------- .../plugin/ball/bukkit/api/BallBukkitAPI.java | 7 ++++--- .../core/bungee/api/BallBungeeCordAPI.java | 6 ++++-- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 8d09e2b..d2db94f 100644 --- a/README.md +++ b/README.md @@ -6,15 +6,17 @@ # 环境变量 -除了从 `config.yml` 中配置服务器信息以外，本插件还支持从环境变量中读取 +为了适配 pterodactyl 面板，本插件除了从 `config.yml` 中配置服务器信息以外，还支持从环境变量中读取 -| 环境变量名称 | 描述 | 对应 config 值 | -|:-----------------------|:------------------|:------------------------------| -| BALL_SERVER_HOST | 服务器唯一识别码，最长 32 字符 | ball-server.host | -| BALL_SERVER_PORT | 服务器唯一识别码，最长 32 字符 | ball-server.port | -| BALL_EVENT_LOOP_THREAD | 服务器唯一识别码，最长 32 字符 | ball-server.event-loop-thread | -| BALL_SERVER_INFO_ID | 服务器唯一识别码，最长 32 字符 | server-info.id | -| BALL_SERVER_INFO_NAME | 服务端名称，用于展示给玩家看 | server-info.name | +| 环境变量名称 | 描述 | 对应 config 值 | +|:-----------------------|:-------------------|:------------------------------| +| BALL_SERVER_HOST | 仓鼠球服务器地址 | ball-server.host | +| BALL_SERVER_PORT | 仓鼠球服务器端口 | ball-server.port | +| BALL_EVENT_LOOP_THREAD | 处理器线程数 | ball-server.event-loop-thread | +| SERVER_IP | 本服务器 IP | server-info.host | +| SERVER_PORT | 本服务器端口 | server-info.port | +| BALL_SERVER_INFO_ID | 本服务器唯一识别码，最长 32 字符 | server-info.id | +| BALL_SERVER_INFO_NAME | 本服务端名称，用于展示给玩家看 | server-info.name | # 添加依赖 diff --git a/hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/api/BallBukkitAPI.java b/hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/api/BallBukkitAPI.java index 2574da3..7fe7f1d 100644 --- a/hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/api/BallBukkitAPI.java +++ b/hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/api/BallBukkitAPI.java @@ -7,7 +7,6 @@ import cn.hamster3.mc.plugin.ball.common.config.BallConfig; import cn.hamster3.mc.plugin.ball.common.entity.BallServerInfo; import cn.hamster3.mc.plugin.ball.common.entity.BallServerType; import cn.hamster3.mc.plugin.ball.common.listener.BallDebugListener; -import org.bukkit.Bukkit; import org.bukkit.configuration.file.FileConfiguration; import org.jetbrains.annotations.NotNull; @@ -38,8 +37,10 @@ public class BallBukkitAPI extends BallAPI { pluginConfig.getString("server-info.id")); String serverInfoName = env.getOrDefault("BALL_SERVER_INFO_NAME", pluginConfig.getString("server-info.name")); - String serverInfoHost = pluginConfig.getString("server-info.host", Bukkit.getIp()); - int serverInfoPort = pluginConfig.getInt("server-info.port", Bukkit.getPort()); + String serverInfoHost = env.getOrDefault("SERVER_IP", + pluginConfig.getString("server-info.host", "0.0.0.0")); + int serverInfoPort = Integer.parseInt(env.getOrDefault("SERVER_PORT", + String.valueOf(pluginConfig.getInt("server-info.port", 25577)))); BallServerInfo serverInfo = new BallServerInfo( serverInfoID, serverInfoName, diff --git a/hamster-ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/BallBungeeCordAPI.java b/hamster-ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/BallBungeeCordAPI.java index bdc0e98..5a9cc0c 100644 --- a/hamster-ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/BallBungeeCordAPI.java +++ b/hamster-ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/BallBungeeCordAPI.java @@ -36,8 +36,10 @@ public class BallBungeeCordAPI extends BallAPI { pluginConfig.getString("server-info.id")); String serverInfoName = env.getOrDefault("BALL_SERVER_INFO_NAME", pluginConfig.getString("server-info.name")); - String serverInfoHost = pluginConfig.getString("server-info.host", "0.0.0.0"); - int serverInfoPort = pluginConfig.getInt("server-info.port", 25577); + String serverInfoHost = env.getOrDefault("SERVER_IP", + pluginConfig.getString("server-info.host", "0.0.0.0")); + int serverInfoPort = Integer.parseInt(env.getOrDefault("SERVER_PORT", + String.valueOf(pluginConfig.getInt("server-info.port", 25577)))); BallServerInfo serverInfo = new BallServerInfo( serverInfoID, serverInfoName,