8 Commits
Author SHA1 Message Date
Coldsmile 4fc709bdb7 feat: 准备 1.4.0 稳定版本
Build / build (push) Has been cancelled
Build / Paper 1.21.11 / Java 21 (push) Has been cancelled
Build / Paper 26.1.2 / Java 25 (push) Has been cancelled
Build / Paper 26.2 / Java 25 (push) Has been cancelled
2026-08-02 12:18:04 +08:00
Coldsmile 19ddd3fa99 feat: 完善稳定性并重构潜影盒安全机制 2026-08-02 03:36:19 +08:00
Coldsmile 18cfbc2002 feat: 完善插件稳定性与兼容性
Build / build (push) Has been cancelled
2026-08-01 00:36:17 +08:00
Coldsmile 5c760b26c6 feat: 完善 TPA 并整理插件配置 2026-07-31 19:07:50 +08:00
Coldsmile 2cad93de9a merge: 合并 SkinBridge 皮肤兼容功能 2026-07-21 23:45:55 +08:00
Coldsmile 2aeb8d0340 feat: 添加 SkinBridge 皮肤兼容并发布 1.7.0 2026-07-21 23:45:19 +08:00
Coldsmile 2479192ad3 Release 1.6.0 with TPA replication 2026-06-25 23:40:30 +08:00
Coldsmile b57c7d4843 feat: release 1.5.0
Release / build (push) Has been cancelled
2026-06-12 00:08:40 +08:00
41 changed files with 2332 additions and 378 deletions
+3 -18
View File
@@ -1,34 +1,19 @@
# 更新日志 # 更新日志
## 1.3.1 - 2026-08-16 ## 1.4.0 - 2026-08-02
### 移除
- 移除内置维护模式、相关命令、权限、配置和 LuckPerms 软依赖;维护功能建议使用独立的 Maintenance 插件。
### 调整
- GitHub 仓库迁移至 InfstarMC 组织,并同步更新项目文档与下载地址。
### 升级说明
- 升级时不再读取 `maintenance.yml`;为避免删除管理员数据,服务器目录中的旧文件会原样保留,可在确认迁移完成后手动删除。
## 1.3.0 - 2026-08-05
### 新增 ### 新增
- 按 HuskHomes 的单服逻辑完整实现 TPA 请求、接受、拒绝、忽略、预热、冷却、位置快照、音效与相关权限。 - 按 HuskHomes 的单服逻辑完整实现 TPA 请求、接受、拒绝、忽略、预热、冷却、位置快照、音效与相关权限。
- 新增维护模式,包括 MOTD、BossBar、登录拦截、白名单、管理员通知和 LuckPerms 异步权限检查。 - 新增维护模式,包括 MOTD、BossBar、登录拦截、白名单、管理员通知和 LuckPerms 异步权限检查。
- 新增 SkinBridge,可识别 InfstarMC、LittleSkin 与自定义 Blessing Skin Provider,并通过 MineSkin 与 Paper Profile API 同步皮肤。 - 新增 SkinBridge,可识别 InfstarMC、LittleSkin 与自定义 Blessing Skin Provider,并通过 MineSkin 与 Paper Profile API 同步皮肤。
- 新增管理模式独立状态存储玩家功能状态管理。 - 新增管理模式独立状态存储玩家功能状态管理与 JEI 配方同步版本适配
### 优化 ### 优化
- 按便捷方块、管理、修复与皮肤功能重新整理运行时模块。 - 按便捷方块、管理、修复与皮肤功能重新整理运行时模块。
- 完善潜影盒会话保护、TPA 请求队列、配置迁移、数据原子写入与持久化错误处理。 - 完善潜影盒会话保护、TPA 请求队列、配置迁移、数据原子写入与持久化错误处理。
- 验证兼容 Paper `1.21.11``26.2`,最终插件保持 Java 21 字节码兼容。 - 适配 Paper `1.21.11``26.1.2``26.2`,最终插件保持 Java 21 字节码兼容。
- 移除实验性的 JEI 配方同步及其版本适配子项目,插件继续通过 Paper 公共 API 兼容支持的服务端版本。
- 迁移 Paper 弃用 API,并将弃用警告设为构建错误。 - 迁移 Paper 弃用 API,并将弃用警告设为构建错误。
- 统一 HuskHomes 风格的中英文消息、颜色和配置注释。 - 统一 HuskHomes 风格的中英文消息、颜色和配置注释。
+33 -24
View File
@@ -2,8 +2,8 @@
轻量、现代、面向 Paper 服务端的基础功能插件,灵感来自 CMI,但更聚焦于常用能力与模块化构建。 轻量、现代、面向 Paper 服务端的基础功能插件,灵感来自 CMI,但更聚焦于常用能力与模块化构建。
[![Version](https://img.shields.io/github/v/release/InfstarMC/EssentialsC?style=flat-square)](https://github.com/InfstarMC/EssentialsC/releases) [![Version](https://img.shields.io/github/v/release/Coldsmiles/EssentialsC?style=flat-square)](https://github.com/Coldsmiles/EssentialsC/releases)
[![License](https://img.shields.io/github/license/InfstarMC/EssentialsC?style=flat-square)](LICENSE) [![License](https://img.shields.io/github/license/Coldsmiles/EssentialsC?style=flat-square)](LICENSE)
[![Paper](https://img.shields.io/badge/Paper-1.21.11%2B-blue?style=flat-square)](https://papermc.io/) [![Paper](https://img.shields.io/badge/Paper-1.21.11%2B-blue?style=flat-square)](https://papermc.io/)
[![Java](https://img.shields.io/badge/Java-21-orange?style=flat-square)](https://adoptium.net/) [![Java](https://img.shields.io/badge/Java-21-orange?style=flat-square)](https://adoptium.net/)
@@ -11,8 +11,8 @@
- 最低支持版本为 `Paper 1.21.11` - 最低支持版本为 `Paper 1.21.11`
- 已适配 `Paper 26.2` - 已适配 `Paper 26.2`
- 插件统一使用 Paper 公共 API 和 Java 21 字节码,无需按服务端版本拆分构建 - 插件使用 `Java 21`,Paper 26.x 版本适配模块使用对应服务端要求的 Java 工具链
- 配置按职责拆分:主行为与 SkinBridge、模块开关、菜单布局和语言文本分别管理 - 配置按职责拆分:主行为与 SkinBridge、模块开关、菜单布局、维护模式和语言文本分别管理
- 支持运行期模块开关,避免为不同功能组合构建多个插件版本 - 支持运行期模块开关,避免为不同功能组合构建多个插件版本
## 主要功能 ## 主要功能
@@ -43,21 +43,16 @@
- `/seen` `(/info)` - `/seen` `(/info)`
- `/tpsbar` - `/tpsbar`
- `/essc admin` 管理模式切换 - `/essc admin` 管理模式切换
- `/maintenance` `(/maint)` 维护模式管理
### 控制台命令
- `/essc help``/essc version``/essc reload`
- `/seen [玩家]``/heal [玩家]``/feed [玩家]``/tpsbar [玩家]`
- `/essc skin [status|refresh] [玩家]`
依赖发送者位置、背包或玩家交互状态的命令仅允许在游戏内执行。控制台执行玩家状态命令时必须明确提供目标玩家。
### 其它功能 ### 其它功能
- Shift + 右键快捷打开潜影盒 - Shift + 右键快捷打开潜影盒
- 潜影盒交互保护,尽量避免刷物品、吞物品和嵌套放入问题 - 潜影盒交互保护,尽量避免刷物品、吞物品和嵌套放入问题
- 管理模式独立背包、装备栏与状态切换 - 管理模式独立背包、装备栏与状态切换
- 维护模式:替换 MOTD、登录拦截、白名单放行和管理员拦截通知
- Enderman 掉落方块控制 - Enderman 掉落方块控制
- JEI 配方同步修复
## 模块配置 ## 模块配置
@@ -68,20 +63,21 @@
| `blocks` | 开启 | 便捷方块命令、`/essc blocks` 菜单、潜影盒快捷打开 | | `blocks` | 开启 | 便捷方块命令、`/essc blocks` 菜单、潜影盒快捷打开 |
| `admin-mode` | 开启 | `/essc admin` 管理模式与独立状态保存 | | `admin-mode` | 开启 | `/essc admin` 管理模式与独立状态保存 |
| `tpsbar` | 开启 | 插件版 TPSBar,检测到服务端原生命令时自动避免冲突 | | `tpsbar` | 开启 | 插件版 TPSBar,检测到服务端原生命令时自动避免冲突 |
| `jei-sync` | 开启 | Fabric / NeoForge JEI 配方同步修复 |
| `mob-drops` | 关闭 | 末影人掉落控制,默认关闭以保留过去标准版行为 | | `mob-drops` | 关闭 | 末影人掉落控制,默认关闭以保留过去标准版行为 |
| `maintenance` | 开启 | 维护模式命令、MOTD 替换、登录拦截、白名单和拦截通知 |
| `skin-bridge` | 关闭 | 查询外置 Yggdrasil profile,并通过 MineSkin 与 Paper Profile API 同步皮肤 | | `skin-bridge` | 关闭 | 查询外置 Yggdrasil profile,并通过 MineSkin 与 Paper Profile API 同步皮肤 |
修改模块开关后使用 `/essc reload` 即可刷新运行期服务、监听器和命令门禁。可选模块命令始终注册,模块关闭时会返回统一的停用提示,因此无需为了启用命令重启服务器。 修改模块开关后使用 `/essc reload` 即可刷新运行期服务、监听器和命令门禁。可选模块命令始终注册,模块关闭时会返回统一的停用提示,因此无需为了启用命令重启服务器。
## 安装说明 ## 安装说明
1. 从 [Releases](https://github.com/InfstarMC/EssentialsC/releases) 下载所需版本。 1. 从 [Releases](https://github.com/Coldsmiles/EssentialsC/releases) 下载所需版本。
2. 将插件放入服务端的 `plugins/` 目录。 2. 将插件放入服务端的 `plugins/` 目录。
3. 启动一次服务端以生成配置文件 3. 建议安装 LuckPerms;维护模式会优先通过其缓存异步检查登录权限,未安装时会在玩家加入后立即复核
4. 按需修改 `plugins/EssentialsC/` 下的配置文件与 `lang/` 语言文件。 4. 启动一次服务端以生成配置文件。
5. 使用权限插件为玩家分配所需权限 5. 按需修改 `plugins/EssentialsC/` 下的配置文件与 `lang/` 语言文件
6. 使用权限插件为玩家分配所需权限。
维护功能建议独立安装 [Maintenance](https://github.com/kennytv/Maintenance)。EssentialsC 不再内置维护模式,也不要求安装该插件。
## 配置说明 ## 配置说明
@@ -92,6 +88,7 @@ SkinBridge 默认关闭。使用前需启用 `modules.yml` 中的 `modules.skin-
- `config.yml` - `config.yml`
- 语言选择 - 语言选择
- 管理模式行为 - 管理模式行为
- JEI 同步开关
- 掉落控制 - 掉落控制
- TPSBar 模式 - TPSBar 模式
- TPA 请求、预热、冷却和音效 - TPA 请求、预热、冷却和音效
@@ -100,6 +97,14 @@ SkinBridge 默认关闭。使用前需启用 `modules.yml` 中的 `modules.skin-
- 功能模块开关 - 功能模块开关
- `blocks-menu.yml` - `blocks-menu.yml`
- 便捷菜单分区、槽位、材质和权限 - 便捷菜单分区、槽位、材质和权限
- `maintenance.yml`
- 维护模式状态
- 维护 MOTD
- 维护踢出提示
- 维护 BossBar
- 绕过权限
- 维护白名单
- 拦截通知权限
- `lang/zh_CN.yml``lang/en_US.yml` - `lang/zh_CN.yml``lang/en_US.yml`
- 命令反馈 - 命令反馈
- 帮助信息 - 帮助信息
@@ -140,10 +145,13 @@ essentialsc.tpa.bypass-cooldown
essentialsc.tpa.warmup.3 essentialsc.tpa.warmup.3
essentialsc.command.admin essentialsc.command.admin
essentialsc.command.tpsbar essentialsc.command.tpsbar
essentialsc.command.maintenance
essentialsc.command.skin essentialsc.command.skin
essentialsc.command.skin.status essentialsc.command.skin.status
essentialsc.command.skin.refresh essentialsc.command.skin.refresh
essentialsc.command.skin.others essentialsc.command.skin.others
essentialsc.maintenance.bypass
essentialsc.maintenance.notify
essentialsc.shulkerbox.open essentialsc.shulkerbox.open
essentialsc.mobdrops.enderman essentialsc.mobdrops.enderman
essentialsc.* essentialsc.*
@@ -154,7 +162,7 @@ essentialsc.*
## 从源码构建 ## 从源码构建
```bash ```bash
git clone https://github.com/InfstarMC/EssentialsC.git git clone https://github.com/Coldsmiles/EssentialsC.git
cd EssentialsC cd EssentialsC
./gradlew build ./gradlew build
``` ```
@@ -173,8 +181,8 @@ Windows 可使用:
./gradlew shadowJar ./gradlew shadowJar
./gradlew build ./gradlew build
./gradlew deployToPaper12111 ./gradlew deployToPaper12111
./gradlew deployToPaper2612
./gradlew deployToPaper262 ./gradlew deployToPaper262
./gradlew deployToLeaves262
``` ```
## 本地测试服 ## 本地测试服
@@ -184,15 +192,16 @@ Windows 可使用:
| 测试服 | 端口 | 部署任务 | 启动脚本 | | 测试服 | 端口 | 部署任务 | 启动脚本 |
| --- | --- | --- | --- | | --- | --- | --- | --- |
| Paper 1.21.11 | `25566` | `deployToPaper12111` | `test-server/paper-1.21.11/start.bat` | | Paper 1.21.11 | `25566` | `deployToPaper12111` | `test-server/paper-1.21.11/start.bat` |
| Paper 26.2 | `25567` | `deployToPaper262` | `test-server/paper-26.2/start.bat` | | Paper 26.1.2 | `25565` | `deployToPaper2612` | `test-server/paper-26.1.2/start.bat` |
| Leaves 26.2 | `25568` | `deployToLeaves262` | `test-server/leaves-26.2/start.bat` | | Paper 26.2 | 以本地配置为准 | `deployToPaper262` | `test-server/paper-26.2/start.bat` |
IDEA 运行配置会先构建插件,再由启动脚本复制最新 JAR,并保留插件数据以便测试升级流程。手动执行部署任务会替换 `EssentialsC*.jar` 并删除 `plugins/EssentialsC` 数据目录,用于测试全新安装及默认配置生成 IDEA 运行配置会在启动测试服前自动执行对应部署任务。部署任务会替换 `EssentialsC*.jar`并删除 `plugins/EssentialsC` 数据目录,以便测试新增默认配置和语言文本
## 开发说明 ## 开发说明
- 使用 `paperweight-userdev` 进行 Paper 开发 - 使用 `paperweight-userdev` 进行 Paper 开发
- 使用 Paper Lifecycle Command API 注册命令,避免直接反射 Bukkit CommandMap - 使用 Paper Lifecycle Command API 注册命令,避免直接反射 Bukkit CommandMap
- 涉及 NMS 的功能通过 `compat-api` + `versions/v<版本>` 适配模块隔离,主插件只依赖稳定接口;当前包含 `1.21.11``26.1.2``26.2`
- 运行时通过 `modules.yml` 控制模块加载,命令始终注册并按模块状态执行门禁 - 运行时通过 `modules.yml` 控制模块加载,命令始终注册并按模块状态执行门禁
- 普通 push/PR 会执行构建与测试,版本标签继续生成 GitHub Release - 普通 push/PR 会执行构建与测试,版本标签继续生成 GitHub Release
@@ -202,5 +211,5 @@ IDEA 运行配置会先构建插件,再由启动脚本复制最新 JAR,并
## 仓库 ## 仓库
- GitHub: <https://github.com/InfstarMC/EssentialsC> - GitHub: <https://github.com/Coldsmiles/EssentialsC>
- Gitea: <https://git.infstar.cn/InfStarMC/EssentialsC> - Gitea: <https://git.infstar.cn/InfStarMC/EssentialsC>
+17 -6
View File
@@ -10,8 +10,7 @@ plugins {
} }
group = 'cn.infstar' group = 'cn.infstar'
def pluginVersion = providers.gradleProperty('pluginVersion').orElse('1.3.1').get() version = providers.gradleProperty('pluginVersion').orElse('1.4.0').get()
version = pluginVersion
repositories { repositories {
mavenCentral() mavenCentral()
@@ -23,6 +22,8 @@ repositories {
dependencies { dependencies {
paperweight.paperDevBundle('1.21.11-R0.1-SNAPSHOT') paperweight.paperDevBundle('1.21.11-R0.1-SNAPSHOT')
compileOnly 'net.luckperms:api:5.5'
implementation project(':compat-api')
implementation 'com.google.code.gson:gson:2.11.0' implementation 'com.google.code.gson:gson:2.11.0'
testImplementation platform('org.junit:junit-bom:5.13.4') testImplementation platform('org.junit:junit-bom:5.13.4')
testImplementation 'org.junit.jupiter:junit-jupiter' testImplementation 'org.junit.jupiter:junit-jupiter'
@@ -51,9 +52,9 @@ tasks.withType(Test).configureEach {
} }
tasks.named('processResources', ProcessResources).configure { tasks.named('processResources', ProcessResources).configure {
inputs.property('version', pluginVersion) inputs.property('version', project.version)
filesMatching('paper-plugin.yml') { filesMatching('paper-plugin.yml') {
expand('version': pluginVersion) expand('version': project.version)
} }
} }
@@ -64,9 +65,19 @@ tasks.named('jar').configure {
tasks.named('shadowJar', ShadowJar).configure { tasks.named('shadowJar', ShadowJar).configure {
group = 'build' group = 'build'
description = '构建包含全部运行期可开关模块的 EssentialsC 插件。' description = '构建包含全部运行期可开关模块的 EssentialsC 插件。'
archiveFileName.set("EssentialsC-${pluginVersion}.jar") archiveFileName.set("EssentialsC-${project.version}.jar")
configurations = [project.configurations.runtimeClasspath] configurations = [project.configurations.runtimeClasspath]
relocate 'com.google.gson', 'cn.infstar.essentialsC.libs.gson' relocate 'com.google.gson', 'cn.infstar.essentialsC.libs.gson'
[
project(':versions:v1_21_11'),
project(':versions:v26_1_2'),
project(':versions:v26_2')
].each { adapterProject ->
def adapterJar = adapterProject.tasks.named('jar')
dependsOn(adapterJar)
from(adapterJar.flatMap { it.archiveFile }.map { archiveFile -> zipTree(archiveFile) })
}
} }
tasks.named('assemble').configure { tasks.named('assemble').configure {
@@ -126,5 +137,5 @@ def registerTestServerDeployTask = { String taskName, String serverPath, String
} }
registerTestServerDeployTask('deployToPaper12111', 'test-server/paper-1.21.11', 'Paper 1.21.11') registerTestServerDeployTask('deployToPaper12111', 'test-server/paper-1.21.11', 'Paper 1.21.11')
registerTestServerDeployTask('deployToPaper2612', 'test-server/paper-26.1.2', 'Paper 26.1.2')
registerTestServerDeployTask('deployToPaper262', 'test-server/paper-26.2', 'Paper 26.2') registerTestServerDeployTask('deployToPaper262', 'test-server/paper-26.2', 'Paper 26.2')
registerTestServerDeployTask('deployToLeaves262', 'test-server/leaves-26.2', 'Leaves 26.2')
+23
View File
@@ -0,0 +1,23 @@
plugins {
id 'java-library'
}
repositories {
mavenCentral()
maven {
name = 'papermc'
url = uri('https://repo.papermc.io/repository/maven-public/')
}
}
dependencies {
compileOnly 'io.papermc.paper:paper-api:1.21.11-R0.1-SNAPSHOT'
}
java {
toolchain.languageVersion.set(JavaLanguageVersion.of(21))
}
tasks.withType(JavaCompile).configureEach {
options.encoding = 'UTF-8'
}
@@ -0,0 +1,14 @@
package cn.infstar.essentialsC.compat.jei;
import org.bukkit.entity.Player;
import java.util.logging.Logger;
public interface JeiRecipeSyncAdapter {
void sendFabricRecipeSync(Player player, Logger logger, boolean debug) throws Exception;
void sendNeoForgeRecipeSync(Player player, Logger logger, boolean debug) throws Exception;
void clearCache();
}
@@ -0,0 +1,22 @@
package cn.infstar.essentialsC.compat.jei;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
public final class RecipeGrouping {
private RecipeGrouping() {
}
public static <K, V> Map<K, List<V>> groupBy(Iterable<V> values,
Function<? super V, ? extends K> keyFunction) {
Map<K, List<V>> grouped = new LinkedHashMap<>();
for (V value : values) {
grouped.computeIfAbsent(keyFunction.apply(value), ignored -> new ArrayList<>()).add(value);
}
return grouped;
}
}
+4 -27
View File
@@ -4,36 +4,13 @@ set -euo pipefail
paper_version="${1:?必须提供 Paper 版本}" paper_version="${1:?必须提供 Paper 版本}"
workspace="$(mktemp -d)" workspace="$(mktemp -d)"
server_pid="" server_pid=""
plugin_jar="$(find build/libs -maxdepth 1 -type f -name 'EssentialsC-*.jar' -print -quit)"
if [[ -z "$plugin_jar" ]]; then
echo "未找到 EssentialsC 构建产物。" >&2
exit 1
fi
plugin_filename="$(basename "$plugin_jar")"
plugin_version="${plugin_filename#EssentialsC-}"
plugin_version="${plugin_version%.jar}"
cleanup() { cleanup() {
if [[ -n "$server_pid" ]] && kill -0 "$server_pid" 2>/dev/null; then if [[ -n "$server_pid" ]] && kill -0 "$server_pid" 2>/dev/null; then
kill -TERM "$server_pid" 2>/dev/null || true kill -TERM "$server_pid" 2>/dev/null || true
for _ in $(seq 1 10); do
if ! kill -0 "$server_pid" 2>/dev/null; then
break
fi
sleep 1
done
if kill -0 "$server_pid" 2>/dev/null; then
kill -KILL "$server_pid" 2>/dev/null || true
fi
wait "$server_pid" 2>/dev/null || true wait "$server_pid" 2>/dev/null || true
fi fi
for _ in 1 2 3; do rm -rf "$workspace"
if rm -rf "$workspace"; then
return
fi
sleep 1
done
echo "警告:无法完全清理临时测试目录 $workspace" >&2
} }
trap cleanup EXIT trap cleanup EXIT
@@ -43,18 +20,18 @@ download_url="$(curl --fail --silent --show-error --location "$metadata_url" \
curl --fail --silent --show-error --location "$download_url" --output "$workspace/paper.jar" curl --fail --silent --show-error --location "$download_url" --output "$workspace/paper.jar"
mkdir -p "$workspace/plugins" mkdir -p "$workspace/plugins"
cp "$plugin_jar" "$workspace/plugins/EssentialsC.jar" cp build/libs/EssentialsC-*.jar "$workspace/plugins/EssentialsC.jar"
printf 'eula=true\n' > "$workspace/eula.txt" printf 'eula=true\n' > "$workspace/eula.txt"
printf 'online-mode=false\nserver-port=0\nenable-query=false\n' > "$workspace/server.properties" printf 'online-mode=false\nserver-port=0\nenable-query=false\n' > "$workspace/server.properties"
( (
cd "$workspace" cd "$workspace"
exec java -Xms512M -Xmx1G -jar paper.jar --nogui > server.log 2>&1 java -Xms512M -Xmx1G -jar paper.jar --nogui > server.log 2>&1
) & ) &
server_pid=$! server_pid=$!
for _ in $(seq 1 120); do for _ in $(seq 1 120); do
if grep -Fq "EssentialsC v${plugin_version} 已启用" "$workspace/server.log"; then if grep -Fq 'EssentialsC v1.4.0 已启用' "$workspace/server.log"; then
if grep -Eq 'UnsupportedClassVersionError|Error occurred while enabling EssentialsC|Could not load.*EssentialsC' "$workspace/server.log"; then if grep -Eq 'UnsupportedClassVersionError|Error occurred while enabling EssentialsC|Could not load.*EssentialsC' "$workspace/server.log"; then
cat "$workspace/server.log" cat "$workspace/server.log"
exit 1 exit 1
+5
View File
@@ -20,3 +20,8 @@ plugins {
} }
rootProject.name = 'EssentialsC' rootProject.name = 'EssentialsC'
include 'compat-api'
include 'versions:v1_21_11'
include 'versions:v26_1_2'
include 'versions:v26_2'
@@ -7,10 +7,13 @@ import cn.infstar.essentialsC.commands.CommandRegistry;
import cn.infstar.essentialsC.commands.HelpCommand; import cn.infstar.essentialsC.commands.HelpCommand;
import cn.infstar.essentialsC.commands.PaperCommand; import cn.infstar.essentialsC.commands.PaperCommand;
import cn.infstar.essentialsC.commands.VanishCommand; import cn.infstar.essentialsC.commands.VanishCommand;
import cn.infstar.essentialsC.listeners.JeiRecipeSyncListener;
import cn.infstar.essentialsC.listeners.MobDropListener; import cn.infstar.essentialsC.listeners.MobDropListener;
import cn.infstar.essentialsC.listeners.MobDropMenuListener; import cn.infstar.essentialsC.listeners.MobDropMenuListener;
import cn.infstar.essentialsC.listeners.ShulkerBoxListener; import cn.infstar.essentialsC.listeners.ShulkerBoxListener;
import cn.infstar.essentialsC.listeners.VanishListener; import cn.infstar.essentialsC.listeners.VanishListener;
import cn.infstar.essentialsC.maintenance.MaintenanceListener;
import cn.infstar.essentialsC.maintenance.MaintenanceManager;
import cn.infstar.essentialsC.player.PlayerStateManager; import cn.infstar.essentialsC.player.PlayerStateManager;
import cn.infstar.essentialsC.skinbridge.SkinBridgeManager; import cn.infstar.essentialsC.skinbridge.SkinBridgeManager;
import cn.infstar.essentialsC.teleport.TeleportRequestManager; import cn.infstar.essentialsC.teleport.TeleportRequestManager;
@@ -20,6 +23,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.command.TabCompleter; import org.bukkit.command.TabCompleter;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.plugin.messaging.Messenger;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import io.papermc.paper.command.brigadier.BasicCommand; import io.papermc.paper.command.brigadier.BasicCommand;
import io.papermc.paper.command.brigadier.CommandSourceStack; import io.papermc.paper.command.brigadier.CommandSourceStack;
@@ -36,11 +40,14 @@ public final class EssentialsC extends JavaPlugin {
private ModuleManager moduleManager; private ModuleManager moduleManager;
private FeatureConfigManager featureConfigManager; private FeatureConfigManager featureConfigManager;
private AdminModeManager adminModeManager; private AdminModeManager adminModeManager;
private MaintenanceManager maintenanceManager;
private TeleportRequestManager teleportRequestManager; private TeleportRequestManager teleportRequestManager;
private PlayerStateManager playerStateManager; private PlayerStateManager playerStateManager;
private MaintenanceListener maintenanceListener;
private TpsBarService tpsBarManager; private TpsBarService tpsBarManager;
private ShulkerBoxListener shulkerBoxListener; private ShulkerBoxListener shulkerBoxListener;
private BlocksMenuCommand blocksMenuCommandListener; private BlocksMenuCommand blocksMenuCommandListener;
private JeiRecipeSyncListener jeiRecipeSyncListener;
private MobDropListener mobDropListener; private MobDropListener mobDropListener;
private MobDropMenuListener mobDropMenuListener; private MobDropMenuListener mobDropMenuListener;
private VanishListener vanishListener; private VanishListener vanishListener;
@@ -68,6 +75,9 @@ public final class EssentialsC extends JavaPlugin {
if (adminModeManager != null) { if (adminModeManager != null) {
adminModeManager.shutdown(); adminModeManager.shutdown();
} }
if (maintenanceManager != null) {
maintenanceManager.shutdown();
}
if (teleportRequestManager != null) { if (teleportRequestManager != null) {
teleportRequestManager.shutdown(); teleportRequestManager.shutdown();
} }
@@ -85,6 +95,7 @@ public final class EssentialsC extends JavaPlugin {
} }
VanishCommand.clearAll(this); VanishCommand.clearAll(this);
unregisterRuntimeListeners(); unregisterRuntimeListeners();
unregisterPluginChannels();
getLogger().info("EssentialsC 已禁用。"); getLogger().info("EssentialsC 已禁用。");
} }
@@ -104,6 +115,10 @@ public final class EssentialsC extends JavaPlugin {
return featureConfigManager; return featureConfigManager;
} }
public MaintenanceManager getMaintenanceManager() {
return maintenanceManager;
}
public TeleportRequestManager getTeleportRequestManager() { public TeleportRequestManager getTeleportRequestManager() {
return teleportRequestManager; return teleportRequestManager;
} }
@@ -124,8 +139,10 @@ public final class EssentialsC extends JavaPlugin {
moduleStatus.clear(); moduleStatus.clear();
refreshCorePlayerFeatures(); refreshCorePlayerFeatures();
refreshAdminMode(); refreshAdminMode();
refreshMaintenance();
refreshTpsBar(); refreshTpsBar();
refreshBlocks(); refreshBlocks();
refreshJeiSync();
refreshMobDrops(); refreshMobDrops();
refreshSkinBridge(); refreshSkinBridge();
} }
@@ -167,6 +184,32 @@ public final class EssentialsC extends JavaPlugin {
setModuleStatus("管理模式", true, "监听器已注册"); setModuleStatus("管理模式", true, "监听器已注册");
} }
private void refreshMaintenance() {
if (!moduleManager.isEnabled(ModuleManager.MAINTENANCE)) {
if (maintenanceManager != null) {
maintenanceManager.shutdown();
maintenanceManager = null;
}
if (maintenanceListener != null) {
HandlerList.unregisterAll(maintenanceListener);
maintenanceListener = null;
}
setModuleStatus("维护模式", false, "已禁用");
return;
}
if (maintenanceManager == null) {
maintenanceManager = new MaintenanceManager(this);
} else {
maintenanceManager.reload();
}
if (maintenanceListener == null) {
maintenanceListener = new MaintenanceListener(this, maintenanceManager);
getServer().getPluginManager().registerEvents(maintenanceListener, this);
}
setModuleStatus("维护模式", true, maintenanceManager.isEnabled() ? "当前开启" : "当前关闭");
}
private void refreshTpsBar() { private void refreshTpsBar() {
if (!moduleManager.isEnabled(ModuleManager.TPSBAR)) { if (!moduleManager.isEnabled(ModuleManager.TPSBAR)) {
if (tpsBarManager != null) { if (tpsBarManager != null) {
@@ -226,6 +269,24 @@ public final class EssentialsC extends JavaPlugin {
setModuleStatus("便捷方块", true, "命令和潜影盒监听器已启用"); setModuleStatus("便捷方块", true, "命令和潜影盒监听器已启用");
} }
private void refreshJeiSync() {
if (jeiRecipeSyncListener != null) {
HandlerList.unregisterAll(jeiRecipeSyncListener);
jeiRecipeSyncListener = null;
}
unregisterPluginChannels();
if (!moduleManager.isEnabled(ModuleManager.JEI_SYNC)) {
setModuleStatus("JEI 同步", false, "已禁用");
return;
}
registerPluginChannels();
jeiRecipeSyncListener = new JeiRecipeSyncListener(this);
getServer().getPluginManager().registerEvents(jeiRecipeSyncListener, this);
setModuleStatus("JEI 同步", true, "插件消息通道已注册");
}
private void refreshMobDrops() { private void refreshMobDrops() {
if (!moduleManager.isEnabled(ModuleManager.MOB_DROPS)) { if (!moduleManager.isEnabled(ModuleManager.MOB_DROPS)) {
if (mobDropListener != null) { if (mobDropListener != null) {
@@ -273,10 +334,24 @@ public final class EssentialsC extends JavaPlugin {
setModuleStatus("皮肤桥接", true, skinBridgeManager.getModuleDetail()); setModuleStatus("皮肤桥接", true, skinBridgeManager.getModuleDetail());
} }
private void registerPluginChannels() {
Messenger messenger = getServer().getMessenger();
messenger.registerOutgoingPluginChannel(this, "fabric:recipe_sync");
messenger.registerOutgoingPluginChannel(this, "neoforge:recipe_content");
}
private void unregisterPluginChannels() {
Messenger messenger = getServer().getMessenger();
messenger.unregisterOutgoingPluginChannel(this, "fabric:recipe_sync");
messenger.unregisterOutgoingPluginChannel(this, "neoforge:recipe_content");
}
private void unregisterRuntimeListeners() { private void unregisterRuntimeListeners() {
unregisterListener(adminModeManager); unregisterListener(adminModeManager);
unregisterListener(maintenanceListener);
unregisterListener(shulkerBoxListener); unregisterListener(shulkerBoxListener);
unregisterListener(blocksMenuCommandListener); unregisterListener(blocksMenuCommandListener);
unregisterListener(jeiRecipeSyncListener);
unregisterListener(mobDropListener); unregisterListener(mobDropListener);
unregisterListener(mobDropMenuListener); unregisterListener(mobDropMenuListener);
unregisterListener(vanishListener); unregisterListener(vanishListener);
@@ -373,8 +448,7 @@ public final class EssentialsC extends JavaPlugin {
@Override @Override
public Collection<String> suggest(CommandSourceStack commandSourceStack, String[] args) { public Collection<String> suggest(CommandSourceStack commandSourceStack, String[] args) {
if (executor instanceof TabCompleter completer) { if (executor instanceof TabCompleter completer) {
String[] completionArgs = args.length == 0 ? new String[]{""} : args; return completer.onTabComplete(commandSourceStack.getSender(), commandAdapter, name, args);
return completer.onTabComplete(commandSourceStack.getSender(), commandAdapter, name, completionArgs);
} }
return List.of(); return List.of();
} }
@@ -44,7 +44,6 @@ public final class FeatureConfigManager {
boolean mainChanged = mainConfig != loadedMainConfig; boolean mainChanged = mainConfig != loadedMainConfig;
mainChanged |= migrateLegacyMainConfig(mainConfig); mainChanged |= migrateLegacyMainConfig(mainConfig);
mainChanged |= migrateLegacyDebugSettings(mainConfig); mainChanged |= migrateLegacyDebugSettings(mainConfig);
mainChanged |= removeRetiredJeiSettings(mainConfig);
if (mainConfig.getInt("config-version", 0) != MAIN_CONFIG_VERSION) { if (mainConfig.getInt("config-version", 0) != MAIN_CONFIG_VERSION) {
mainConfig.set("config-version", MAIN_CONFIG_VERSION); mainConfig.set("config-version", MAIN_CONFIG_VERSION);
mainChanged = true; mainChanged = true;
@@ -136,16 +135,6 @@ public final class FeatureConfigManager {
return true; return true;
} }
private boolean removeRetiredJeiSettings(FileConfiguration mainConfig) {
if (!mainConfig.contains("jei-sync", true)) {
return false;
}
mainConfig.set("jei-sync", null);
plugin.getLogger().info("已从 config.yml 移除停用的 JEI 配方同步配置。");
return true;
}
private void copySection(ConfigurationSection source, FileConfiguration target) { private void copySection(ConfigurationSection source, FileConfiguration target) {
if (source == null) { if (source == null) {
return; return;
@@ -21,9 +21,6 @@ import java.util.regex.Pattern;
public class LangManager { public class LangManager {
private static final Pattern HEX_COLOR_PATTERN = Pattern.compile("(?i)&#([0-9a-f]{6})"); private static final Pattern HEX_COLOR_PATTERN = Pattern.compile("(?i)&#([0-9a-f]{6})");
private static final Pattern MINI_MESSAGE_TAG_PATTERN = Pattern.compile(
"(?<!\\\\)(</?)([A-Za-z][A-Za-z0-9_-]*)(?=[:>])"
);
private static final MiniMessage MINI_MESSAGE = MiniMessage.miniMessage(); private static final MiniMessage MINI_MESSAGE = MiniMessage.miniMessage();
private static final LegacyComponentSerializer LEGACY_AMPERSAND = LegacyComponentSerializer.legacyAmpersand(); private static final LegacyComponentSerializer LEGACY_AMPERSAND = LegacyComponentSerializer.legacyAmpersand();
private static final LegacyComponentSerializer LEGACY_SECTION = LegacyComponentSerializer.legacySection(); private static final LegacyComponentSerializer LEGACY_SECTION = LegacyComponentSerializer.legacySection();
@@ -164,25 +161,18 @@ public class LangManager {
langFile.setDefaults(selectedDefaults); langFile.setDefaults(selectedDefaults);
} }
static String applyPlaceholders(String value, Map<String, String> placeholders) { private String applyPlaceholders(String value, Map<String, String> placeholders) {
String result = value; String result = value;
boolean miniMessage = looksLikeMiniMessage(value);
for (Map.Entry<String, String> entry : placeholders.entrySet()) { for (Map.Entry<String, String> entry : placeholders.entrySet()) {
String replacement = miniMessage result = result.replace("{" + entry.getKey() + "}", escapeMiniMessageReplacement(entry.getValue()));
? escapeMiniMessageReplacement(entry.getValue())
: entry.getValue();
result = result.replace("{" + entry.getKey() + "}", replacement == null ? "" : replacement);
} }
return result; return result;
} }
static String escapeMiniMessageReplacement(String value) { private String escapeMiniMessageReplacement(String value) {
if (value == null) { if (value == null) {
return ""; return "";
} }
if (value.indexOf('§') >= 0) {
return MINI_MESSAGE.serialize(LEGACY_SECTION.deserialize(value));
}
return value.replace("\\", "\\\\").replace("<", "\\<"); return value.replace("\\", "\\\\").replace("<", "\\<");
} }
@@ -223,7 +213,7 @@ public class LangManager {
} }
if (looksLikeMiniMessage(text)) { if (looksLikeMiniMessage(text)) {
try { try {
return MINI_MESSAGE.deserialize(normalizeMiniMessageTags(text)); return MINI_MESSAGE.deserialize(text);
} catch (RuntimeException ignored) { } catch (RuntimeException ignored) {
// 配置中 MiniMessage 语法错误时回退到旧颜色码解析,避免消息完全不可用。 // 配置中 MiniMessage 语法错误时回退到旧颜色码解析,避免消息完全不可用。
} }
@@ -231,20 +221,8 @@ public class LangManager {
return LEGACY_SECTION.deserialize(translateColorCodes(text)); return LEGACY_SECTION.deserialize(translateColorCodes(text));
} }
private static boolean looksLikeMiniMessage(String text) { private boolean looksLikeMiniMessage(String text) {
int open = text.indexOf('<'); int open = text.indexOf('<');
return open >= 0 && text.indexOf('>', open) > open; return open >= 0 && text.indexOf('>', open) > open;
} }
static String normalizeMiniMessageTags(String text) {
Matcher matcher = MINI_MESSAGE_TAG_PATTERN.matcher(text);
StringBuilder result = new StringBuilder();
while (matcher.find()) {
matcher.appendReplacement(result, Matcher.quoteReplacement(
matcher.group(1) + matcher.group(2).toLowerCase(java.util.Locale.ROOT)
));
}
matcher.appendTail(result);
return result.toString();
}
} }
@@ -1,6 +1,5 @@
package cn.infstar.essentialsC; package cn.infstar.essentialsC;
import cn.infstar.essentialsC.util.AtomicYamlWriter;
import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
@@ -18,7 +17,9 @@ public final class ModuleManager {
public static final String BLOCKS = "blocks"; public static final String BLOCKS = "blocks";
public static final String ADMIN_MODE = "admin-mode"; public static final String ADMIN_MODE = "admin-mode";
public static final String TPSBAR = "tpsbar"; public static final String TPSBAR = "tpsbar";
public static final String JEI_SYNC = "jei-sync";
public static final String MOB_DROPS = "mob-drops"; public static final String MOB_DROPS = "mob-drops";
public static final String MAINTENANCE = "maintenance";
public static final String SKIN_BRIDGE = "skin-bridge"; public static final String SKIN_BRIDGE = "skin-bridge";
private static final Map<String, Boolean> DEFAULT_MODULES = new LinkedHashMap<>(); private static final Map<String, Boolean> DEFAULT_MODULES = new LinkedHashMap<>();
@@ -27,7 +28,9 @@ public final class ModuleManager {
DEFAULT_MODULES.put(BLOCKS, true); DEFAULT_MODULES.put(BLOCKS, true);
DEFAULT_MODULES.put(ADMIN_MODE, true); DEFAULT_MODULES.put(ADMIN_MODE, true);
DEFAULT_MODULES.put(TPSBAR, true); DEFAULT_MODULES.put(TPSBAR, true);
DEFAULT_MODULES.put(JEI_SYNC, true);
DEFAULT_MODULES.put(MOB_DROPS, false); DEFAULT_MODULES.put(MOB_DROPS, false);
DEFAULT_MODULES.put(MAINTENANCE, true);
DEFAULT_MODULES.put(SKIN_BRIDGE, false); DEFAULT_MODULES.put(SKIN_BRIDGE, false);
} }
@@ -55,27 +58,11 @@ public final class ModuleManager {
throw new IllegalStateException("无法加载 modules.yml,请修复配置格式后重试。", exception); throw new IllegalStateException("无法加载 modules.yml,请修复配置格式后重试。", exception);
} }
modulesConfig = loaded; modulesConfig = loaded;
boolean removedRetiredModules = false;
for (String retiredModule : new String[]{"jei-sync", "maintenance"}) {
String retiredPath = "modules." + retiredModule;
if (modulesConfig.contains(retiredPath, true)) {
modulesConfig.set(retiredPath, null);
removedRetiredModules = true;
}
}
modulesConfig.addDefault("config-version", CURRENT_CONFIG_VERSION); modulesConfig.addDefault("config-version", CURRENT_CONFIG_VERSION);
for (Map.Entry<String, Boolean> module : DEFAULT_MODULES.entrySet()) { for (Map.Entry<String, Boolean> module : DEFAULT_MODULES.entrySet()) {
modulesConfig.addDefault(path(module.getKey()), module.getValue()); modulesConfig.addDefault(path(module.getKey()), module.getValue());
} }
modulesConfig.options().copyDefaults(true); modulesConfig.options().copyDefaults(true);
if (removedRetiredModules) {
try {
AtomicYamlWriter.save(modulesConfig, modulesFile);
plugin.getLogger().info("已从 modules.yml 移除退役功能的配置项。");
} catch (IOException exception) {
plugin.getLogger().warning("清理 modules.yml 中的退役配置失败: " + exception.getMessage());
}
}
} }
public boolean isEnabled(String moduleKey) { public boolean isEnabled(String moduleKey) {
@@ -49,17 +49,12 @@ public abstract class BaseCommand implements CommandExecutor {
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
return dispatch(sender, args);
}
final boolean dispatch(CommandSender sender, String[] args) {
if (!sender.hasPermission(permission)) {
sender.sendMessage(getLang().getPrefixedString("messages.no-permission",
Map.of("permission", permission)));
return true;
}
if (sender instanceof Player player) { if (sender instanceof Player player) {
if (!player.hasPermission(permission)) {
player.sendMessage(getLang().getPrefixedString("messages.no-permission",
Map.of("permission", permission)));
return true;
}
return execute(player, args); return execute(player, args);
} }
@@ -48,6 +48,7 @@ public final class CommandRegistry {
registerCore("tpignore", "essentialsc.command.tpignore", TpIgnoreCommand::new); registerCore("tpignore", "essentialsc.command.tpignore", TpIgnoreCommand::new);
register("tpsbar", "essentialsc.command.tpsbar", ModuleManager.TPSBAR, TpsBarCommand::new); register("tpsbar", "essentialsc.command.tpsbar", ModuleManager.TPSBAR, TpsBarCommand::new);
register("mobdrops", "essentialsc.mobdrops.enderman", ModuleManager.MOB_DROPS, MobDropCommand::new); register("mobdrops", "essentialsc.mobdrops.enderman", ModuleManager.MOB_DROPS, MobDropCommand::new);
register("maintenance", "essentialsc.command.maintenance", ModuleManager.MAINTENANCE, MaintenanceCommand::new, "maint");
registerSubCommand("admin", "essentialsc.command.admin", ModuleManager.ADMIN_MODE, AdminCommand::new); registerSubCommand("admin", "essentialsc.command.admin", ModuleManager.ADMIN_MODE, AdminCommand::new);
registerSubCommand("skin", "essentialsc.command.skin", ModuleManager.SKIN_BRIDGE, SkinBridgeCommand::new); registerSubCommand("skin", "essentialsc.command.skin", ModuleManager.SKIN_BRIDGE, SkinBridgeCommand::new);
} }
@@ -1,7 +1,6 @@
package cn.infstar.essentialsC.commands; package cn.infstar.essentialsC.commands;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.Map; import java.util.Map;
@@ -37,30 +36,6 @@ public class FeedCommand extends BaseCommand {
return true; return true;
} }
@Override
protected boolean executeConsole(CommandSender sender, String[] args) {
if (args.length != 1) {
sender.sendMessage(getLang().getPrefixedString("messages.feed-usage-console"));
return true;
}
if (!sender.hasPermission("essentialsc.command.feed.others")) {
sender.sendMessage(getLang().getPrefixedString("messages.no-permission-others"));
return true;
}
Player target = Bukkit.getPlayerExact(args[0]);
if (target == null) {
sender.sendMessage(getLang().getPrefixedString("messages.player-not-found", Map.of("player", args[0])));
return true;
}
feedPlayer(target);
sender.sendMessage(getLang().getPrefixedString("messages.feed-other", Map.of("player", target.getName())));
target.sendMessage(getLang().getPrefixedString("messages.feed-by-other",
Map.of("admin", getLang().getString("messages.console-name"))));
return true;
}
private void feedPlayer(Player player) { private void feedPlayer(Player player) {
player.setFoodLevel(20); player.setFoodLevel(20);
player.setSaturation(20f); player.setSaturation(20f);
@@ -3,7 +3,6 @@ package cn.infstar.essentialsC.commands;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.attribute.Attribute; import org.bukkit.attribute.Attribute;
import org.bukkit.attribute.AttributeInstance; import org.bukkit.attribute.AttributeInstance;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.Map; import java.util.Map;
@@ -39,30 +38,6 @@ public class HealCommand extends BaseCommand {
return true; return true;
} }
@Override
protected boolean executeConsole(CommandSender sender, String[] args) {
if (args.length != 1) {
sender.sendMessage(getLang().getPrefixedString("messages.heal-usage-console"));
return true;
}
if (!sender.hasPermission("essentialsc.command.heal.others")) {
sender.sendMessage(getLang().getPrefixedString("messages.no-permission-others"));
return true;
}
Player target = Bukkit.getPlayerExact(args[0]);
if (target == null) {
sender.sendMessage(getLang().getPrefixedString("messages.player-not-found", Map.of("player", args[0])));
return true;
}
healPlayer(target);
sender.sendMessage(getLang().getPrefixedString("messages.heal-other", Map.of("player", target.getName())));
target.sendMessage(getLang().getPrefixedString("messages.heal-by-other",
Map.of("admin", getLang().getString("messages.console-name"))));
return true;
}
private void healPlayer(Player player) { private void healPlayer(Player player) {
AttributeInstance maxHealth = player.getAttribute(Attribute.MAX_HEALTH); AttributeInstance maxHealth = player.getAttribute(Attribute.MAX_HEALTH);
player.setHealth(maxHealth == null ? player.getHealth() : maxHealth.getValue()); player.setHealth(maxHealth == null ? player.getHealth() : maxHealth.getValue());
@@ -38,12 +38,7 @@ public class HelpCommand extends BaseCommand implements TabCompleter {
@Override @Override
protected boolean executeConsole(CommandSender sender, String[] args) { protected boolean executeConsole(CommandSender sender, String[] args) {
if (args.length == 0 || args[0].equalsIgnoreCase("help")) { if (args.length > 0 && args[0].equalsIgnoreCase("reload")) {
sendConsoleHelp(sender);
return true;
}
if (args[0].equalsIgnoreCase("reload")) {
if (!sender.hasPermission("essentialsc.command.reload")) { if (!sender.hasPermission("essentialsc.command.reload")) {
sendNoPermission(sender, "essentialsc.command.reload"); sendNoPermission(sender, "essentialsc.command.reload");
return true; return true;
@@ -56,58 +51,10 @@ public class HelpCommand extends BaseCommand implements TabCompleter {
sender.sendMessage(getLang().getPrefixedString("messages.config-reloaded")); sender.sendMessage(getLang().getPrefixedString("messages.config-reloaded"));
return true; return true;
} }
sender.sendMessage(getLang().getPrefixedString("messages.player-only"));
if (args[0].equalsIgnoreCase("version") || args[0].equalsIgnoreCase("v")) {
sender.sendMessage(getLang().getPrefixedString("messages.version",
Map.of("version", plugin.getPluginMeta().getVersion())));
sender.sendMessage(getLang().getPrefixedString("messages.paper-version",
Map.of("version", Bukkit.getVersion())));
return true;
}
String actualCommand = getActualCommand(args[0]);
BaseCommand targetCommand = CommandRegistry.getCommand(actualCommand);
if (actualCommand != null && targetCommand != null) {
return targetCommand.dispatch(sender, Arrays.copyOfRange(args, 1, args.length));
}
sender.sendMessage(getLang().getPrefixedString("messages.unknown-subcommand",
Map.of("command", args[0])));
sender.sendMessage(getLang().getPrefixedString("messages.help-usage"));
return true; return true;
} }
private void sendConsoleHelp(CommandSender sender) {
LangManager lang = getLang();
sendPrefixed(sender, lang.getString("help.title"));
sendPrefixed(sender, lang.getString("help.version",
Map.of("version", plugin.getPluginMeta().getVersion())));
sender.sendMessage("");
sendPrefixed(sender, lang.getString("help.section-other"));
if (sender.hasPermission("essentialsc.command.reload")) {
sendPrefixed(sender, lang.getString("help.commands.reload"));
}
sendPrefixed(sender, lang.getString("help.commands.version"));
if (CommandRegistry.isAvailable("seen") && sender.hasPermission("essentialsc.command.seen")) {
sendPrefixed(sender, lang.getString("help.commands.seen"));
}
if (CommandRegistry.isAvailable("heal") && sender.hasPermission("essentialsc.command.heal")) {
sendPrefixed(sender, lang.getString("help.commands.heal"));
}
if (CommandRegistry.isAvailable("feed") && sender.hasPermission("essentialsc.command.feed")) {
sendPrefixed(sender, lang.getString("help.commands.feed"));
}
if (CommandRegistry.isAvailable("skin") && sender.hasPermission("essentialsc.command.skin")) {
sendPrefixed(sender, lang.getString("help.commands.skin"));
}
if (CommandRegistry.isAvailable("tpsbar") && sender.hasPermission("essentialsc.command.tpsbar")) {
sendPrefixed(sender, lang.getString("help.commands.tpsbar"));
}
sender.sendMessage("");
sendPrefixed(sender, lang.getString("help.footer"));
}
private boolean handleCommand(CommandSender sender, Player player, String[] args) { private boolean handleCommand(CommandSender sender, Player player, String[] args) {
if (args.length > 0) { if (args.length > 0) {
String subCommand = args[0].toLowerCase(); String subCommand = args[0].toLowerCase();
@@ -278,6 +225,10 @@ public class HelpCommand extends BaseCommand implements TabCompleter {
otherCommands.append(lang.getString("help.commands.tpsbar")).append("\n"); otherCommands.append(lang.getString("help.commands.tpsbar")).append("\n");
hasOtherCommands = true; hasOtherCommands = true;
} }
if (CommandRegistry.isAvailable("maintenance") && player.hasPermission("essentialsc.command.maintenance")) {
otherCommands.append(lang.getString("help.commands.maintenance")).append("\n");
hasOtherCommands = true;
}
if (hasOtherCommands) { if (hasOtherCommands) {
sendPrefixed(player, lang.getString("help.section-other")); sendPrefixed(player, lang.getString("help.section-other"));
@@ -295,7 +246,7 @@ public class HelpCommand extends BaseCommand implements TabCompleter {
} }
private void sendPrefixed(CommandSender sender, String message) { private void sendPrefixed(CommandSender sender, String message) {
sender.sendMessage(getLang().getPrefix() + message); sender.sendMessage(message);
} }
private void sendPrefixedLines(CommandSender sender, String message) { private void sendPrefixedLines(CommandSender sender, String message) {
@@ -359,6 +310,8 @@ public class HelpCommand extends BaseCommand implements TabCompleter {
{"tpignore", "essentialsc.command.tpignore"}, {"tpignore", "essentialsc.command.tpignore"},
{"skin", "essentialsc.command.skin"}, {"skin", "essentialsc.command.skin"},
{"tpsbar", "essentialsc.command.tpsbar"}, {"tpsbar", "essentialsc.command.tpsbar"},
{"maintenance", "essentialsc.command.maintenance"},
{"maint", "essentialsc.command.maintenance"},
{"mobdrops", "essentialsc.mobdrops.enderman"}, {"mobdrops", "essentialsc.mobdrops.enderman"},
{"admin", "essentialsc.command.admin"}, {"admin", "essentialsc.command.admin"},
{"version", null}, {"version", null},
@@ -441,6 +394,10 @@ public class HelpCommand extends BaseCommand implements TabCompleter {
return players; return players;
} }
if ((subCmd.equals("maintenance") || subCmd.equals("maint"))
&& sender.hasPermission("essentialsc.command.maintenance")) {
return completeMaintenanceArgs(args[1]);
}
} }
if (args.length == 3 && args[0].equalsIgnoreCase("skin") if (args.length == 3 && args[0].equalsIgnoreCase("skin")
@@ -485,4 +442,14 @@ public class HelpCommand extends BaseCommand implements TabCompleter {
return completions; return completions;
} }
private List<String> completeMaintenanceArgs(String partialInput) {
List<String> completions = new ArrayList<>();
String partial = partialInput.toLowerCase();
for (String option : List.of("on", "off", "status", "reload", "add", "remove", "list")) {
if (option.startsWith(partial)) {
completions.add(option);
}
}
return completions;
}
} }
@@ -0,0 +1,179 @@
package cn.infstar.essentialsC.commands;
import cn.infstar.essentialsC.maintenance.MaintenanceManager;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.command.TabCompleter;
import org.bukkit.entity.Player;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
public class MaintenanceCommand extends BaseCommand implements TabCompleter {
public MaintenanceCommand() {
super("essentialsc.command.maintenance");
}
@Override
protected boolean execute(Player player, String[] args) {
return executeCommand(player, args);
}
@Override
protected boolean executeConsole(CommandSender sender, String[] args) {
return executeCommand(sender, args);
}
private boolean executeCommand(CommandSender sender, String[] args) {
MaintenanceManager maintenanceManager = plugin.getMaintenanceManager();
if (maintenanceManager == null) {
sender.sendMessage(getLang().getPrefixedString("messages.module-disabled"));
return true;
}
if (args.length == 0 || args[0].equalsIgnoreCase("status")) {
sendStatus(sender, maintenanceManager);
return true;
}
switch (args[0].toLowerCase(Locale.ROOT)) {
case "on", "enable", "enabled" -> {
if (maintenanceManager.setEnabled(true) == MaintenanceManager.OperationResult.SAVE_FAILED) {
sendSaveFailed(sender);
return true;
}
sender.sendMessage(getLang().getPrefixedString("maintenance.messages.enabled"));
return true;
}
case "off", "disable", "disabled" -> {
if (maintenanceManager.setEnabled(false) == MaintenanceManager.OperationResult.SAVE_FAILED) {
sendSaveFailed(sender);
return true;
}
sender.sendMessage(getLang().getPrefixedString("maintenance.messages.disabled"));
return true;
}
case "reload" -> {
maintenanceManager.reload();
sender.sendMessage(getLang().getPrefixedString("maintenance.messages.reloaded"));
return true;
}
case "add" -> {
if (args.length < 2) {
sender.sendMessage(getLang().getPrefixedString("maintenance.messages.add-usage"));
return true;
}
String target = args[1];
MaintenanceManager.OperationResult result = maintenanceManager.addWhitelistEntry(target);
if (result == MaintenanceManager.OperationResult.SAVE_FAILED) {
sendSaveFailed(sender);
} else if (result == MaintenanceManager.OperationResult.SUCCESS) {
sender.sendMessage(getLang().getPrefixedString("maintenance.messages.whitelist-added",
Map.of("player", target)));
} else {
sender.sendMessage(getLang().getPrefixedString("maintenance.messages.whitelist-exists",
Map.of("player", target)));
}
return true;
}
case "remove" -> {
if (args.length < 2) {
sender.sendMessage(getLang().getPrefixedString("maintenance.messages.remove-usage"));
return true;
}
String target = args[1];
MaintenanceManager.OperationResult result = maintenanceManager.removeWhitelistEntry(target);
if (result == MaintenanceManager.OperationResult.SAVE_FAILED) {
sendSaveFailed(sender);
} else if (result == MaintenanceManager.OperationResult.SUCCESS) {
sender.sendMessage(getLang().getPrefixedString("maintenance.messages.whitelist-removed",
Map.of("player", target)));
} else {
sender.sendMessage(getLang().getPrefixedString("maintenance.messages.whitelist-missing",
Map.of("player", target)));
}
return true;
}
case "list" -> {
sendWhitelist(sender, maintenanceManager);
return true;
}
default -> {
sender.sendMessage(getLang().getPrefixedString("maintenance.messages.usage"));
return true;
}
}
}
private void sendStatus(CommandSender sender, MaintenanceManager maintenanceManager) {
String status = getLang().getString(maintenanceManager.isEnabled()
? "maintenance.status.enabled"
: "maintenance.status.disabled");
sender.sendMessage(getLang().getPrefixedString("maintenance.messages.status",
Map.of(
"status", status,
"whitelist_count", String.valueOf(maintenanceManager.getWhitelistCount())
)));
}
private void sendWhitelist(CommandSender sender, MaintenanceManager maintenanceManager) {
List<String> entries = maintenanceManager.getWhitelistEntries();
if (entries.isEmpty()) {
sender.sendMessage(getLang().getPrefixedString("maintenance.messages.whitelist-empty"));
return;
}
sender.sendMessage(getLang().getPrefixedString("maintenance.messages.whitelist-list",
Map.of(
"count", String.valueOf(entries.size()),
"entries", String.join(", ", entries)
)));
}
private void sendSaveFailed(CommandSender sender) {
sender.sendMessage(getLang().getPrefixedString("maintenance.messages.save-failed"));
}
@Override
public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) {
if (!sender.hasPermission(getPermission())) {
return List.of();
}
if (args.length == 1) {
return complete(args[0], List.of("on", "off", "status", "reload", "add", "remove", "list"));
}
if (args.length == 2 && args[0].equalsIgnoreCase("add")) {
return complete(args[1], plugin.getServer().getOnlinePlayers().stream()
.map(Player::getName)
.toList());
}
if (args.length == 2 && args[0].equalsIgnoreCase("remove")) {
MaintenanceManager maintenanceManager = plugin.getMaintenanceManager();
if (maintenanceManager == null) {
return List.of();
}
return complete(args[1], maintenanceManager.getWhitelistEntries());
}
return List.of();
}
private List<String> complete(String input, List<String> options) {
String partial = input.toLowerCase(Locale.ROOT);
List<String> completions = new ArrayList<>();
for (String option : options) {
if (option.toLowerCase(Locale.ROOT).startsWith(partial)) {
completions.add(option);
}
}
return completions;
}
}
@@ -2,7 +2,6 @@ package cn.infstar.essentialsC.commands;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
@@ -17,56 +16,45 @@ public class SeenCommand extends BaseCommand {
@Override @Override
protected boolean execute(Player player, String[] args) { protected boolean execute(Player player, String[] args) {
return executeCommand(player, player, args);
}
@Override
protected boolean executeConsole(CommandSender sender, String[] args) {
return executeCommand(sender, null, args);
}
private boolean executeCommand(CommandSender sender, Player viewer, String[] args) {
if (args.length == 0) { if (args.length == 0) {
sender.sendMessage(getLang().getPrefixedString(viewer == null player.sendMessage(getLang().getPrefixedString("messages.seen-usage"));
? "messages.seen-usage-console"
: "messages.seen-usage"));
return true; return true;
} }
Player onlineTarget = Bukkit.getPlayerExact(args[0]); Player onlineTarget = Bukkit.getPlayerExact(args[0]);
if (onlineTarget != null && VanishCommand.isVanished(onlineTarget) if (onlineTarget != null && VanishCommand.isVanished(onlineTarget)
&& viewer != null && !viewer.hasPermission(VanishCommand.SEE_PERMISSION)) { && !player.hasPermission(VanishCommand.SEE_PERMISSION)) {
sender.sendMessage(getLang().getPrefixedString("messages.player-not-found", Map.of("player", args[0]))); player.sendMessage(getLang().getPrefixedString("messages.player-not-found", Map.of("player", args[0])));
return true; return true;
} }
OfflinePlayer target = Bukkit.getOfflinePlayer(args[0]); OfflinePlayer target = Bukkit.getOfflinePlayer(args[0]);
if (!target.hasPlayedBefore() && !target.isOnline()) { if (!target.hasPlayedBefore() && !target.isOnline()) {
sender.sendMessage(getLang().getPrefixedString("messages.player-not-found", Map.of("player", args[0]))); player.sendMessage(getLang().getPrefixedString("messages.player-not-found", Map.of("player", args[0])));
return true; return true;
} }
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
sender.sendMessage(getLang().getPrefixedComponent("messages.seen-header", player.sendMessage(getLang().getPrefixedComponent("messages.seen-header",
Map.of("player", String.valueOf(target.getName())))); Map.of("player", String.valueOf(target.getName()))));
if (target.isOnline()) { if (target.isOnline()) {
sender.sendMessage(getLang().getComponent("messages.seen-status-online")); player.sendMessage(getLang().getComponent("messages.seen-status-online"));
Player onlinePlayer = target.getPlayer(); Player onlinePlayer = target.getPlayer();
if (onlinePlayer != null) { if (onlinePlayer != null) {
sender.sendMessage(getLang().getComponent("messages.seen-world", player.sendMessage(getLang().getComponent("messages.seen-world",
Map.of("world", onlinePlayer.getWorld().getName()))); Map.of("world", onlinePlayer.getWorld().getName())));
} }
} else { } else {
sender.sendMessage(getLang().getComponent("messages.seen-status-offline")); player.sendMessage(getLang().getComponent("messages.seen-status-offline"));
long lastSeen = target.getLastSeen(); long lastSeen = target.getLastSeen();
if (lastSeen > 0) { if (lastSeen > 0) {
sender.sendMessage(getLang().getComponent("messages.seen-last-online", player.sendMessage(getLang().getComponent("messages.seen-last-online",
Map.of("time", format.format(new Date(lastSeen))))); Map.of("time", format.format(new Date(lastSeen)))));
} }
} }
sender.sendMessage(getLang().getComponent("messages.seen-first-joined", player.sendMessage(getLang().getComponent("messages.seen-first-joined",
Map.of("time", format.format(new Date(target.getFirstPlayed()))))); Map.of("time", format.format(new Date(target.getFirstPlayed())))));
return true; return true;
} }
@@ -63,37 +63,17 @@ public class TpsBarCommand extends BaseCommand implements TabCompleter {
@Override @Override
protected boolean executeConsole(CommandSender sender, String[] args) { protected boolean executeConsole(CommandSender sender, String[] args) {
TpsBarService tpsBarService = plugin.getTpsBarManager(); sender.sendMessage(getLang().getPrefixedString("messages.player-only"));
if (tpsBarService == null) {
sender.sendMessage(getLang().getPrefixedString("messages.module-disabled"));
return true;
}
if (args.length != 1) {
sender.sendMessage(tpsBarService.getUsageMessage());
return true;
}
if (!sender.hasPermission("essentialsc.command.tpsbar.others")) {
sender.sendMessage(getLang().getPrefixedString("messages.no-permission",
Map.of("permission", "essentialsc.command.tpsbar.others")));
return true;
}
Player target = Bukkit.getPlayerExact(args[0]);
if (target == null) {
sender.sendMessage(tpsBarService.getPlayerNotFoundMessage(args[0]));
return true;
}
boolean enabled = tpsBarService.toggle(target);
sender.sendMessage(getLang().getPrefixedString(enabled
? "tpsbar.messages.enabled-other"
: "tpsbar.messages.disabled-other", Map.of("player", target.getName())));
return true; return true;
} }
@Override @Override
public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) { public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) {
if (args.length != 1 || !sender.hasPermission("essentialsc.command.tpsbar.others")) { if (args.length != 1 || !(sender instanceof Player player)) {
return List.of();
}
if (!player.hasPermission("essentialsc.command.tpsbar.others")) {
return List.of(); return List.of();
} }
@@ -0,0 +1,171 @@
package cn.infstar.essentialsC.listeners;
import cn.infstar.essentialsC.EssentialsC;
import cn.infstar.essentialsC.compat.jei.JeiRecipeSyncAdapter;
import io.papermc.paper.event.server.ServerResourcesReloadedEvent;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent;
import java.util.Locale;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
/**
* 为 Fabric / NeoForge 客户端补发配方同步数据,修复 1.21.2+ 的 JEI 配方显示问题。
*/
public class JeiRecipeSyncListener implements Listener {
private static final Set<String> WARNED_UNSUPPORTED_VERSIONS = ConcurrentHashMap.newKeySet();
private final EssentialsC plugin;
private final boolean debug;
private final boolean sendPlayerMessage;
private final int brandCheckDelayTicks;
private final JeiRecipeSyncAdapter adapter;
public JeiRecipeSyncListener(EssentialsC plugin) {
this.plugin = plugin;
FileConfiguration config = plugin.getConfig();
config.addDefault("jei-sync.brand-check-delay-ticks", 20);
config.options().copyDefaults(true);
this.debug = config.getBoolean("debug", false);
this.sendPlayerMessage = config.getBoolean("jei-sync.send-player-message", true);
this.brandCheckDelayTicks = Math.max(0, config.getInt("jei-sync.brand-check-delay-ticks", 20));
this.adapter = loadAdapter();
}
@EventHandler
public void onPlayerJoin(PlayerJoinEvent event) {
if (adapter == null) {
if (debug) {
plugin.getLogger().warning("当前服务端版本没有可用的 JEI 配方同步适配器。");
}
return;
}
Player player = event.getPlayer();
plugin.getServer().getScheduler().runTaskLater(plugin, () -> detectAndSync(player), brandCheckDelayTicks);
}
@EventHandler
public void onServerResourcesReloaded(ServerResourcesReloadedEvent event) {
if (adapter != null) {
adapter.clearCache();
}
}
private void detectAndSync(Player player) {
if (!player.isOnline()) {
return;
}
String clientBrand = player.getClientBrandName();
if (debug) {
plugin.getLogger().info("JEI 客户端检测: player=" + player.getName()
+ ", brand=" + (clientBrand == null || clientBrand.isBlank() ? "unknown" : clientBrand)
+ ", delayTicks=" + brandCheckDelayTicks);
}
if (clientBrand == null || clientBrand.isEmpty()) {
if (debug) {
plugin.getLogger().info("跳过 " + player.getName() + ":客户端品牌为空");
}
return;
}
String brandLower = clientBrand.toLowerCase(Locale.ROOT);
if (brandLower.contains("fabric")) {
if (debug) {
plugin.getLogger().info("检测到 Fabric 客户端,开始发送配方同步...");
}
sendPlayerMessage(player, "Fabric");
sendFabricRecipeSync(player);
return;
}
if (brandLower.contains("neoforge") || brandLower.contains("forge")) {
if (debug) {
plugin.getLogger().info("检测到 NeoForge/Forge 客户端,开始发送配方同步...");
}
sendPlayerMessage(player, "NeoForge");
sendNeoForgeRecipeSync(player);
return;
}
if (debug) {
plugin.getLogger().info("跳过 " + player.getName() + ":不支持的客户端类型 '" + clientBrand + "'");
}
}
private void sendPlayerMessage(Player player, String clientType) {
if (!sendPlayerMessage) {
return;
}
String messageKey;
if (clientType.equalsIgnoreCase("fabric")) {
messageKey = "messages.jei-sync-fabric";
} else if (clientType.equalsIgnoreCase("neoforge")) {
messageKey = "messages.jei-sync-neoforge";
} else {
return;
}
player.sendMessage(EssentialsC.getLangManager().getPrefixedComponent(messageKey));
}
private void sendFabricRecipeSync(Player player) {
try {
adapter.sendFabricRecipeSync(player, plugin.getLogger(), debug);
} catch (Exception e) {
plugin.getLogger().warning("发送 Fabric 配方同步失败: " + e.getMessage());
if (debug) {
plugin.getLogger().log(Level.WARNING, "Fabric 配方同步异常详情", e);
}
}
}
private void sendNeoForgeRecipeSync(Player player) {
try {
adapter.sendNeoForgeRecipeSync(player, plugin.getLogger(), debug);
} catch (Exception e) {
plugin.getLogger().warning("发送 NeoForge 配方同步失败: " + e.getMessage());
if (debug) {
plugin.getLogger().log(Level.WARNING, "NeoForge 配方同步异常详情", e);
}
}
}
private JeiRecipeSyncAdapter loadAdapter() {
String versionKey = plugin.getServer().getBukkitVersion().split("-")[0]
.replace('.', '_');
String className = "cn.infstar.essentialsC.v" + versionKey + ".jei.JeiRecipeSyncAdapterImpl";
try {
Class<?> adapterClass = Class.forName(className);
Object instance = adapterClass.getDeclaredConstructor().newInstance();
if (instance instanceof JeiRecipeSyncAdapter jeiRecipeSyncAdapter) {
if (debug) {
plugin.getLogger().info("已加载 JEI 配方同步适配器: " + className);
}
return jeiRecipeSyncAdapter;
}
plugin.getLogger().warning("JEI 配方同步适配器类型无效: " + className);
} catch (ReflectiveOperationException | LinkageError e) {
if (WARNED_UNSUPPORTED_VERSIONS.add(versionKey)) {
plugin.getLogger().warning("当前 Paper 版本 " + plugin.getServer().getBukkitVersion()
+ " 没有可用的 JEI 配方同步适配器;仅 JEI 同步功能已停用。");
}
if (debug) {
plugin.getLogger().warning("加载 JEI 配方同步适配器失败: " + className + " (" + e.getMessage() + ")");
}
}
return null;
}
}
@@ -109,7 +109,7 @@ public class ShulkerBoxListener implements Listener {
} }
} }
@EventHandler(priority = EventPriority.HIGHEST) @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onPlayerInteract(PlayerInteractEvent event) { public void onPlayerInteract(PlayerInteractEvent event) {
if (event.getAction() != Action.RIGHT_CLICK_AIR && event.getAction() != Action.RIGHT_CLICK_BLOCK) { if (event.getAction() != Action.RIGHT_CLICK_AIR && event.getAction() != Action.RIGHT_CLICK_BLOCK) {
return; return;
@@ -120,10 +120,6 @@ public class ShulkerBoxListener implements Listener {
return; return;
} }
if (event.useItemInHand() == org.bukkit.event.Event.Result.DENY) {
return;
}
if (openShulkerBoxes.containsKey(player.getUniqueId())) { if (openShulkerBoxes.containsKey(player.getUniqueId())) {
return; return;
} }
@@ -0,0 +1,56 @@
package cn.infstar.essentialsC.maintenance;
import cn.infstar.essentialsC.EssentialsC;
import net.luckperms.api.LuckPerms;
import net.luckperms.api.model.user.User;
import net.luckperms.api.model.user.UserManager;
import net.luckperms.api.query.QueryOptions;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicBoolean;
public final class LuckPermsMaintenancePermissionResolver implements MaintenancePermissionResolver {
private final EssentialsC plugin;
private final LuckPerms luckPerms;
private final UserManager userManager;
private final AtomicBoolean failureLogged = new AtomicBoolean();
public LuckPermsMaintenancePermissionResolver(EssentialsC plugin) {
this.plugin = plugin;
this.luckPerms = plugin.getServer().getServicesManager().load(LuckPerms.class);
if (luckPerms == null) {
throw new IllegalStateException("LuckPerms 服务尚未注册");
}
this.userManager = luckPerms.getUserManager();
}
@Override
public PermissionResult checkPermission(UUID uniqueId, String permission) {
if (uniqueId == null || permission == null || permission.isBlank()) {
return PermissionResult.DENIED;
}
try {
User user = userManager.getUser(uniqueId);
if (user == null) {
user = userManager.loadUser(uniqueId).join();
}
QueryOptions queryOptions = luckPerms.getContextManager().getQueryOptions(user)
.orElseGet(() -> luckPerms.getContextManager().getStaticQueryOptions());
boolean granted = user.getCachedData()
.getPermissionData(queryOptions)
.checkPermission(permission)
.asBoolean();
failureLogged.set(false);
return granted ? PermissionResult.GRANTED : PermissionResult.DENIED;
} catch (RuntimeException exception) {
if (failureLogged.compareAndSet(false, true)) {
plugin.getLogger().warning("LuckPerms 维护权限查询失败,将在玩家加入后复核权限: "
+ exception.getMessage());
}
return PermissionResult.UNAVAILABLE;
}
}
}
@@ -0,0 +1,111 @@
package cn.infstar.essentialsC.maintenance;
import cn.infstar.essentialsC.EssentialsC;
import cn.infstar.essentialsC.ModuleManager;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.event.server.ServerListPingEvent;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.util.Map;
public final class MaintenanceListener implements Listener {
private final EssentialsC plugin;
private final MaintenanceManager maintenanceManager;
private final MaintenancePermissionResolver permissionResolver;
public MaintenanceListener(EssentialsC plugin, MaintenanceManager maintenanceManager) {
this.plugin = plugin;
this.maintenanceManager = maintenanceManager;
this.permissionResolver = MaintenancePermissionResolverFactory.create(plugin);
}
@EventHandler
public void onServerListPing(ServerListPingEvent event) {
if (!plugin.getModuleManager().isEnabled(ModuleManager.MAINTENANCE)
|| !maintenanceManager.isEnabled()
|| !maintenanceManager.isMotdEnabled()) {
return;
}
event.motd(maintenanceManager.getMotd());
}
@EventHandler(priority = EventPriority.HIGHEST)
public void onPlayerPreLogin(AsyncPlayerPreLoginEvent event) {
if (event.getLoginResult() != AsyncPlayerPreLoginEvent.Result.ALLOWED) {
return;
}
MaintenanceManager.AccessSnapshot snapshot = maintenanceManager.getAccessSnapshot();
if (!snapshot.enabled() || snapshot.isWhitelisted(event.getUniqueId(), event.getName())) {
return;
}
if (permissionResolver == null) {
return;
}
MaintenancePermissionResolver.PermissionResult permissionResult = permissionResolver
.checkPermission(event.getUniqueId(), snapshot.bypassPermission());
if (permissionResult != MaintenancePermissionResolver.PermissionResult.DENIED) {
return;
}
event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, snapshot.kickMessage());
notifyBlockedLogin(event.getName(), event.getUniqueId().toString(), event.getAddress(), snapshot);
}
@EventHandler
public void onPlayerJoin(PlayerJoinEvent event) {
if (!plugin.getModuleManager().isEnabled(ModuleManager.MAINTENANCE)) {
return;
}
Player player = event.getPlayer();
if (maintenanceManager.isEnabled() && !maintenanceManager.canJoin(player)) {
MaintenanceManager.AccessSnapshot snapshot = maintenanceManager.getAccessSnapshot();
player.kick(snapshot.kickMessage());
InetSocketAddress socketAddress = player.getAddress();
notifyBlockedLogin(player.getName(), player.getUniqueId().toString(),
socketAddress == null ? null : socketAddress.getAddress(), snapshot);
return;
}
maintenanceManager.addBossBarPlayer(player);
}
@EventHandler
public void onPlayerQuit(PlayerQuitEvent event) {
maintenanceManager.removeBossBarPlayer(event.getPlayer());
}
private void notifyBlockedLogin(String playerName, String uniqueId, InetAddress inetAddress,
MaintenanceManager.AccessSnapshot snapshot) {
if (!snapshot.notifyEnabled()) {
return;
}
String visibleAddress = snapshot.includeAddress() && inetAddress != null ? inetAddress.getHostAddress() : null;
plugin.getServer().getScheduler().runTask(plugin, () -> {
String address = visibleAddress == null
? EssentialsC.getLangManager().getString("maintenance.status.address-hidden")
: visibleAddress;
var message = EssentialsC.getLangManager().getPrefixedComponent("maintenance.messages.login-blocked",
Map.of("player", playerName, "uuid", uniqueId, "address", address));
for (Player onlinePlayer : plugin.getServer().getOnlinePlayers()) {
if (onlinePlayer.hasPermission(snapshot.notifyPermission())) {
onlinePlayer.sendMessage(message);
}
}
});
}
}
@@ -0,0 +1,441 @@
package cn.infstar.essentialsC.maintenance;
import cn.infstar.essentialsC.EssentialsC;
import cn.infstar.essentialsC.util.AtomicYamlWriter;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import org.bukkit.Bukkit;
import org.bukkit.boss.BarColor;
import org.bukkit.boss.BarStyle;
import org.bukkit.boss.BossBar;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Locale;
import java.util.Set;
import java.util.UUID;
public final class MaintenanceManager {
private static final int CURRENT_CONFIG_VERSION = 1;
private static final LegacyComponentSerializer LEGACY_AMPERSAND = LegacyComponentSerializer.legacyAmpersand();
private static final LegacyComponentSerializer LEGACY_SECTION = LegacyComponentSerializer.legacySection();
private final EssentialsC plugin;
private final File configFile;
private FileConfiguration config;
private BossBar bossBar;
private volatile AccessSnapshot accessSnapshot = AccessSnapshot.disabled();
public MaintenanceManager(EssentialsC plugin) {
this.plugin = plugin;
this.configFile = new File(plugin.getDataFolder(), "maintenance.yml");
reload();
}
public void reload() {
if (!configFile.exists()) {
plugin.saveResource("maintenance.yml", false);
}
config = loadConfiguration();
config.addDefault("config-version", CURRENT_CONFIG_VERSION);
config.addDefault("enabled", false);
config.addDefault("bypass-permission", "essentialsc.maintenance.bypass");
config.addDefault("notify.enabled", true);
config.addDefault("notify.permission", "essentialsc.maintenance.notify");
config.addDefault("notify.include-address", false);
config.addDefault("whitelist.uuids", List.of());
config.addDefault("whitelist.names", List.of());
config.addDefault("motd.enabled", true);
config.addDefault("motd.lines", List.of("&c服务器维护中", "&7请稍后再试"));
config.addDefault("kick-message", List.of("&c服务器正在维护", "&7请稍后再进入"));
config.addDefault("bossbar.enabled", true);
config.addDefault("bossbar.title", "&c服务器正在维护");
config.addDefault("bossbar.color", "RED");
config.addDefault("bossbar.style", "SOLID");
config.addDefault("bossbar.progress", 1.0D);
config.options().copyDefaults(true);
publishAccessSnapshot();
refreshBossBar();
if (isEnabled()) {
kickUnauthorizedPlayers();
}
}
public boolean isEnabled() {
return config.getBoolean("enabled", false);
}
public OperationResult setEnabled(boolean enabled) {
if (isEnabled() == enabled) {
return OperationResult.UNCHANGED;
}
boolean previous = isEnabled();
config.set("enabled", enabled);
if (!save()) {
config.set("enabled", previous);
return OperationResult.SAVE_FAILED;
}
publishAccessSnapshot();
refreshBossBar();
if (enabled) {
kickUnauthorizedPlayers();
}
return OperationResult.SUCCESS;
}
public String getBypassPermission() {
return config.getString("bypass-permission", "essentialsc.maintenance.bypass");
}
public boolean isNotifyEnabled() {
return config.getBoolean("notify.enabled", true);
}
public String getNotifyPermission() {
return config.getString("notify.permission", "essentialsc.maintenance.notify");
}
public boolean shouldIncludeAddressInNotification() {
return config.getBoolean("notify.include-address", false);
}
public boolean canJoin(Player player) {
return player != null && (player.hasPermission(getBypassPermission()) || isWhitelisted(player));
}
public AccessSnapshot getAccessSnapshot() {
return accessSnapshot;
}
public boolean isWhitelisted(Player player) {
if (player == null) {
return false;
}
return getWhitelistUuids().contains(player.getUniqueId().toString().toLowerCase(Locale.ROOT))
|| getWhitelistNames().contains(normalizeName(player.getName()));
}
public OperationResult addWhitelistEntry(String input) {
String normalized = normalizeEntry(input);
if (normalized.isEmpty()) {
return OperationResult.UNCHANGED;
}
UUID uuid = parseUuid(normalized);
if (uuid != null) {
return addWhitelistUuid(uuid.toString());
}
Player onlinePlayer = Bukkit.getPlayerExact(normalized);
if (onlinePlayer != null) {
return addWhitelistUuid(onlinePlayer.getUniqueId().toString());
}
return addWhitelistName(input);
}
public OperationResult removeWhitelistEntry(String input) {
String normalized = normalizeEntry(input);
if (normalized.isEmpty()) {
return OperationResult.UNCHANGED;
}
UUID uuid = parseUuid(normalized);
if (uuid != null) {
return removeWhitelistUuid(uuid.toString());
}
Player onlinePlayer = Bukkit.getPlayerExact(normalized);
if (onlinePlayer != null) {
OperationResult uuidResult = removeWhitelistUuid(onlinePlayer.getUniqueId().toString());
if (uuidResult != OperationResult.UNCHANGED) {
return uuidResult;
}
}
return removeWhitelistName(input);
}
public List<String> getWhitelistEntries() {
List<String> entries = new ArrayList<>();
entries.addAll(getWhitelistNames());
entries.addAll(getWhitelistUuids());
return entries;
}
public int getWhitelistCount() {
return getWhitelistEntries().size();
}
public boolean isMotdEnabled() {
return config.getBoolean("motd.enabled", true);
}
public Component getMotd() {
return colorizeLines(config.getStringList("motd.lines"));
}
public Component getKickMessage() {
return colorizeLines(config.getStringList("kick-message"));
}
public void refreshBossBar() {
clearBossBar();
if (!isEnabled() || !isBossBarEnabled()) {
return;
}
bossBar = plugin.getServer().createBossBar(
LEGACY_SECTION.serialize(colorize(config.getString("bossbar.title", "&c服务器正在维护"))),
readBossBarColor(),
readBossBarStyle()
);
bossBar.setProgress(readBossBarProgress());
bossBar.setVisible(true);
for (Player player : plugin.getServer().getOnlinePlayers()) {
addBossBarPlayer(player);
}
}
public void addBossBarPlayer(Player player) {
if (bossBar == null || player == null || !player.isOnline()) {
return;
}
bossBar.addPlayer(player);
}
public void removeBossBarPlayer(Player player) {
if (bossBar != null && player != null) {
bossBar.removePlayer(player);
}
}
private void kickUnauthorizedPlayers() {
Component message = getKickMessage();
for (Player player : List.copyOf(plugin.getServer().getOnlinePlayers())) {
if (!canJoin(player)) {
player.kick(message);
}
}
}
public void shutdown() {
accessSnapshot = AccessSnapshot.disabled();
clearBossBar();
}
private void clearBossBar() {
if (bossBar == null) {
return;
}
bossBar.removeAll();
bossBar = null;
}
private boolean isBossBarEnabled() {
return config.getBoolean("bossbar.enabled", true);
}
private BarColor readBossBarColor() {
try {
return BarColor.valueOf(config.getString("bossbar.color", "RED").toUpperCase(Locale.ROOT));
} catch (IllegalArgumentException ignored) {
return BarColor.RED;
}
}
private BarStyle readBossBarStyle() {
try {
return BarStyle.valueOf(config.getString("bossbar.style", "SOLID").toUpperCase(Locale.ROOT));
} catch (IllegalArgumentException ignored) {
return BarStyle.SOLID;
}
}
private double readBossBarProgress() {
double progress = config.getDouble("bossbar.progress", 1.0D);
if (!Double.isFinite(progress)) {
return 1.0D;
}
return Math.max(0.0D, Math.min(1.0D, progress));
}
private OperationResult addWhitelistUuid(String uuid) {
return updateWhitelist("whitelist.uuids", uuid.toLowerCase(Locale.ROOT), true);
}
private OperationResult addWhitelistName(String name) {
return updateWhitelist("whitelist.names", normalizeName(name), true);
}
private OperationResult removeWhitelistUuid(String uuid) {
return updateWhitelist("whitelist.uuids", uuid.toLowerCase(Locale.ROOT), false);
}
private OperationResult removeWhitelistName(String name) {
return updateWhitelist("whitelist.names", normalizeName(name), false);
}
private OperationResult updateWhitelist(String path, String value, boolean add) {
if (value == null || value.isBlank()) {
return OperationResult.UNCHANGED;
}
List<String> previousEntries = new ArrayList<>(config.getStringList(path));
Set<String> entries = path.endsWith(".names") ? getWhitelistNames() : getWhitelistUuids();
boolean changed;
if (add) {
changed = entries.add(value);
} else {
changed = entries.remove(value);
}
if (!changed) {
return OperationResult.UNCHANGED;
}
config.set(path, new ArrayList<>(entries));
if (!save()) {
config.set(path, previousEntries);
return OperationResult.SAVE_FAILED;
}
publishAccessSnapshot();
refreshBossBar();
if (isEnabled()) {
kickUnauthorizedPlayers();
}
return OperationResult.SUCCESS;
}
private Set<String> getWhitelistUuids() {
Set<String> entries = new LinkedHashSet<>();
for (String value : config.getStringList("whitelist.uuids")) {
String normalized = normalizeEntry(value).toLowerCase(Locale.ROOT);
if (!normalized.isEmpty()) {
entries.add(normalized);
}
}
return entries;
}
private Set<String> getWhitelistNames() {
Set<String> entries = new LinkedHashSet<>();
for (String value : config.getStringList("whitelist.names")) {
String normalized = normalizeName(value);
if (!normalized.isEmpty()) {
entries.add(normalized);
}
}
return entries;
}
private UUID parseUuid(String input) {
try {
return UUID.fromString(input);
} catch (IllegalArgumentException ignored) {
return null;
}
}
private String normalizeEntry(String input) {
return input == null ? "" : input.trim();
}
private String normalizeName(String input) {
return normalizeEntry(input).toLowerCase(Locale.ROOT);
}
private Component colorizeLines(List<String> lines) {
if (lines == null || lines.isEmpty()) {
return Component.empty();
}
return colorize(String.join("\n", lines));
}
private Component colorize(String text) {
return LEGACY_AMPERSAND.deserialize(text == null ? "" : text);
}
private void publishAccessSnapshot() {
Set<UUID> whitelistUuids = new LinkedHashSet<>();
for (String value : getWhitelistUuids()) {
UUID uuid = parseUuid(value);
if (uuid != null) {
whitelistUuids.add(uuid);
}
}
accessSnapshot = new AccessSnapshot(
isEnabled(),
getBypassPermission(),
whitelistUuids,
getWhitelistNames(),
getKickMessage(),
isNotifyEnabled(),
getNotifyPermission(),
shouldIncludeAddressInNotification()
);
}
private boolean save() {
try {
AtomicYamlWriter.save(config, configFile);
return true;
} catch (Exception e) {
plugin.getLogger().warning("保存 maintenance.yml 失败: " + e.getMessage());
return false;
}
}
private YamlConfiguration loadConfiguration() {
YamlConfiguration loaded = new YamlConfiguration();
loaded.options().parseComments(true);
try {
loaded.load(configFile);
} catch (IOException | InvalidConfigurationException exception) {
plugin.getLogger().severe("加载 maintenance.yml 失败: " + exception.getMessage());
throw new IllegalStateException("无法加载 maintenance.yml,请修复配置格式后重试。", exception);
}
return loaded;
}
public record AccessSnapshot(boolean enabled, String bypassPermission, Set<UUID> whitelistUuids,
Set<String> whitelistNames, Component kickMessage, boolean notifyEnabled,
String notifyPermission, boolean includeAddress) {
public AccessSnapshot {
bypassPermission = bypassPermission == null ? "" : bypassPermission;
whitelistUuids = Set.copyOf(whitelistUuids);
whitelistNames = Set.copyOf(whitelistNames);
kickMessage = kickMessage == null ? Component.empty() : kickMessage;
notifyPermission = notifyPermission == null ? "" : notifyPermission;
}
public boolean isWhitelisted(UUID uniqueId, String playerName) {
return whitelistUuids.contains(uniqueId)
|| whitelistNames.contains(playerName == null ? "" : playerName.trim().toLowerCase(Locale.ROOT));
}
private static AccessSnapshot disabled() {
return new AccessSnapshot(false, "", Set.of(), Set.of(), Component.empty(), false, "", false);
}
}
public enum OperationResult {
SUCCESS,
UNCHANGED,
SAVE_FAILED
}
}
@@ -0,0 +1,14 @@
package cn.infstar.essentialsC.maintenance;
import java.util.UUID;
public interface MaintenancePermissionResolver {
PermissionResult checkPermission(UUID uniqueId, String permission);
enum PermissionResult {
GRANTED,
DENIED,
UNAVAILABLE
}
}
@@ -0,0 +1,35 @@
package cn.infstar.essentialsC.maintenance;
import cn.infstar.essentialsC.EssentialsC;
import org.bukkit.plugin.Plugin;
import java.lang.reflect.InvocationTargetException;
final class MaintenancePermissionResolverFactory {
private static final String LUCKPERMS_RESOLVER_CLASS =
"cn.infstar.essentialsC.maintenance.LuckPermsMaintenancePermissionResolver";
private MaintenancePermissionResolverFactory() {
}
static MaintenancePermissionResolver create(EssentialsC plugin) {
Plugin luckPerms = plugin.getServer().getPluginManager().getPlugin("LuckPerms");
if (luckPerms == null || !luckPerms.isEnabled()) {
plugin.getLogger().info("未检测到 LuckPerms,维护模式将在玩家加入后复核绕过权限。");
return null;
}
try {
Class<?> resolverClass = Class.forName(LUCKPERMS_RESOLVER_CLASS, true, plugin.getClass().getClassLoader());
return (MaintenancePermissionResolver) resolverClass
.getConstructor(EssentialsC.class)
.newInstance(plugin);
} catch (ClassNotFoundException | NoSuchMethodException | InstantiationException
| IllegalAccessException | InvocationTargetException | LinkageError exception) {
plugin.getLogger().warning("LuckPerms 维护权限解析器初始化失败,将在玩家加入后复核权限: "
+ exception.getMessage());
return null;
}
}
}
+10 -4
View File
@@ -1,5 +1,5 @@
# EssentialsC 主配置 # EssentialsC 主配置
# 其他配置:modules.yml、blocks-menu.yml # 其他配置:modules.yml、maintenance.yml、blocks-menu.yml
# 消息与颜色:lang/<语言>.yml # 消息与颜色:lang/<语言>.yml
# 修改后使用 /essc reload 重载;命令注册状态发生变化时建议重启服务器。 # 修改后使用 /essc reload 重载;命令注册状态发生变化时建议重启服务器。
@@ -17,17 +17,23 @@ admin-mode:
actionbar: actionbar:
interval-ticks: 40 interval-ticks: 40
# JEI 配方同步修复;是否加载由 modules.yml 控制。
jei-sync:
# 玩家加入后延迟多少 tick 检测客户端品牌。
brand-check-delay-ticks: 20
send-player-message: true
# 生物掉落 # 生物掉落
mob-drops: mob-drops:
enderman: enderman:
# 控制该生物死亡时是否掉落物品(经验值正常掉落);当前仅支持末影人 # 允许末影人掉落搬运的方块
allow-drops: true allow-drops: true
# TPA 传送请求 # TPA 传送请求,行为参考 HuskHomes。
tpa: tpa:
# 请求有效时间,单位为秒。 # 请求有效时间,单位为秒。
timeout-seconds: 60 timeout-seconds: 60
# 每名接收者最多保留的待处理请求数;超出时移除最早请求。 # 每名接收者最多保留的待处理请求数;参考 EssentialsX超出时移除最早请求。
max-pending-requests: 5 max-pending-requests: 5
# 位置规则 # 位置规则
+31 -10
View File
@@ -1,12 +1,11 @@
# English language file # English language file
# MiniMessage format with green success, red errors, and gray details. # HuskHomes-inspired style: MiniMessage, green success, red errors, gray details.
prefix: '<#00FB9A><bold>[EssentialsC]</bold></#00FB9A><gray>: </gray>' prefix: ''
messages: messages:
no-permission: '<#FF3300>Error:</#FF3300> <#FF7E5E>You do not have permission to use this command.</#FF7E5E> <gray>Required: {permission}</gray>' no-permission: '<#FF3300>Error:</#FF3300> <#FF7E5E>You do not have permission to use this command.</#FF7E5E> <gray>Required: {permission}</gray>'
player-only: '<#FF3300>Error:</#FF3300> <#FF7E5E>This command can only be run by players.</#FF7E5E>' player-only: '<#FF3300>Error:</#FF3300> <#FF7E5E>This command can only be run by players.</#FF7E5E>'
console-name: 'Console'
config-reloaded: '<#00FB9A>Configuration reloaded.</#00FB9A>' config-reloaded: '<#00FB9A>Configuration reloaded.</#00FB9A>'
version: '<#00FB9A>EssentialsC v{version}</#00FB9A>' version: '<#00FB9A>EssentialsC v{version}</#00FB9A>'
paper-version: '<gray>Running on Paper {version}</gray>' paper-version: '<gray>Running on Paper {version}</gray>'
@@ -50,11 +49,9 @@ messages:
heal-self: '<#00FB9A>Your health and hunger have been restored.</#00FB9A>' heal-self: '<#00FB9A>Your health and hunger have been restored.</#00FB9A>'
heal-other: '<#00FB9A>You healed <bold>{player}</bold>.</#00FB9A>' heal-other: '<#00FB9A>You healed <bold>{player}</bold>.</#00FB9A>'
heal-by-other: '<#00FB9A>You were healed by <bold>{admin}</bold>.</#00FB9A>' heal-by-other: '<#00FB9A>You were healed by <bold>{admin}</bold>.</#00FB9A>'
heal-usage-console: '<#FF3300>Error:</#FF3300> <#FF7E5E>Usage: /heal [player]</#FF7E5E>'
feed-self: '<#00FB9A>Your hunger has been restored.</#00FB9A>' feed-self: '<#00FB9A>Your hunger has been restored.</#00FB9A>'
feed-other: '<#00FB9A>You fed <bold>{player}</bold>.</#00FB9A>' feed-other: '<#00FB9A>You fed <bold>{player}</bold>.</#00FB9A>'
feed-by-other: '<#00FB9A>You were fed by <bold>{admin}</bold>.</#00FB9A>' feed-by-other: '<#00FB9A>You were fed by <bold>{admin}</bold>.</#00FB9A>'
feed-usage-console: '<#FF3300>Error:</#FF3300> <#FF7E5E>Usage: /feed [player]</#FF7E5E>'
repair-hand-success: '<#00FB9A>Repaired the item in your hand.</#00FB9A>' repair-hand-success: '<#00FB9A>Repaired the item in your hand.</#00FB9A>'
repair-all-success: '<#00FB9A>Repaired <bold>{count}</bold> item(s).</#00FB9A>' repair-all-success: '<#00FB9A>Repaired <bold>{count}</bold> item(s).</#00FB9A>'
repair-not-damaged: '<#FF3300>Error:</#FF3300> <#FF7E5E>This item is not damaged.</#FF7E5E>' repair-not-damaged: '<#FF3300>Error:</#FF3300> <#FF7E5E>This item is not damaged.</#FF7E5E>'
@@ -68,6 +65,9 @@ messages:
shulkerbox-unstack-first: '<#FF3300>Error:</#FF3300> <#FF7E5E>Please unstack the shulker box before quick opening it.</#FF7E5E>' shulkerbox-unstack-first: '<#FF3300>Error:</#FF3300> <#FF7E5E>Please unstack the shulker box before quick opening it.</#FF7E5E>'
shulkerbox-open-failed: '<#FF3300>Error:</#FF3300> <#FF7E5E>Failed to open the shulker box. Please try again.</#FF7E5E>' shulkerbox-open-failed: '<#FF3300>Error:</#FF3300> <#FF7E5E>Failed to open the shulker box. Please try again.</#FF7E5E>'
shulkerbox-session-invalid: '<#FF3300>Error:</#FF3300> <#FF7E5E>The shulker box session became invalid. Saving was stopped to prevent item duplication.</#FF7E5E>' shulkerbox-session-invalid: '<#FF3300>Error:</#FF3300> <#FF7E5E>The shulker box session became invalid. Saving was stopped to prevent item duplication.</#FF7E5E>'
jei-sync-fabric: '<#00FB9A>Synchronizing recipes for your <bold>Fabric</bold> client…</#00FB9A>'
jei-sync-neoforge: '<#00FB9A>Synchronizing recipes for your <bold>NeoForge</bold> client…</#00FB9A>'
help: help:
title: '<#00FB9A><bold>EssentialsC</bold></#00FB9A> <gray>Command Help</gray>' title: '<#00FB9A><bold>EssentialsC</bold></#00FB9A> <gray>Command Help</gray>'
version: '<gray>Plugin version: <white>{version}</white></gray>' version: '<gray>Plugin version: <white>{version}</white></gray>'
@@ -76,8 +76,6 @@ help:
footer: '<gray>Each command requires the corresponding permission.</gray>' footer: '<gray>Each command requires the corresponding permission.</gray>'
commands: commands:
reload: '<white>/essc reload</white> <gray>- Reload plugin configuration</gray>'
version: '<white>/essc version</white> <gray>- View plugin and server versions</gray>'
workbench: '<white>/workbench</white> <gray>- Open a crafting table</gray>' workbench: '<white>/workbench</white> <gray>- Open a crafting table</gray>'
anvil: '<white>/anvil</white> <gray>- Open an anvil</gray>' anvil: '<white>/anvil</white> <gray>- Open an anvil</gray>'
enchantingtable: '<white>/enchantingtable</white> <gray>- Open an enchanting table</gray>' enchantingtable: '<white>/enchantingtable</white> <gray>- Open an enchanting table</gray>'
@@ -93,10 +91,10 @@ help:
fly: '<white>/fly</white> <gray>- Toggle flight mode</gray>' fly: '<white>/fly</white> <gray>- Toggle flight mode</gray>'
nightvision: '<white>/nightvision</white> <gray>- Toggle night vision</gray>' nightvision: '<white>/nightvision</white> <gray>- Toggle night vision</gray>'
glow: '<white>/glow</white> <gray>- Toggle glowing</gray>' glow: '<white>/glow</white> <gray>- Toggle glowing</gray>'
heal: '<white>/heal [player]</white> <gray>- Restore health and hunger</gray>' heal: '<white>/heal</white> <gray>- Restore health and hunger</gray>'
vanish: '<white>/vanish</white> <gray>- Toggle vanish mode</gray>' vanish: '<white>/vanish</white> <gray>- Toggle vanish mode</gray>'
seen: '<white>/seen [player]</white> <gray>- View player information</gray>' seen: '<white>/seen</white> <gray>- View player information</gray>'
feed: '<white>/feed [player]</white> <gray>- Restore hunger</gray>' feed: '<white>/feed</white> <gray>- Restore hunger</gray>'
repair: '<white>/repair</white> <gray>- Repair held or all items</gray>' repair: '<white>/repair</white> <gray>- Repair held or all items</gray>'
tpa: '<white>/tpa [player]</white> <gray>- Request to teleport to a player</gray>' tpa: '<white>/tpa [player]</white> <gray>- Request to teleport to a player</gray>'
tpahere: '<white>/tpahere [player]</white> <gray>- Request a player teleport to you</gray>' tpahere: '<white>/tpahere [player]</white> <gray>- Request a player teleport to you</gray>'
@@ -107,6 +105,7 @@ help:
skin: '<white>/essc skin [status|refresh] [player]</white> <gray>- View or refresh SkinBridge status</gray>' skin: '<white>/essc skin [status|refresh] [player]</white> <gray>- View or refresh SkinBridge status</gray>'
admin: '<white>/essc admin</white> <gray>- Toggle admin mode</gray>' admin: '<white>/essc admin</white> <gray>- Toggle admin mode</gray>'
tpsbar: '<white>/tpsbar [player]</white> <gray>- Toggle TPS boss bar</gray>' tpsbar: '<white>/tpsbar [player]</white> <gray>- Toggle TPS boss bar</gray>'
maintenance: '<white>/maintenance [on|off|status|reload|add|remove|list]</white> <gray>- Manage maintenance mode</gray>'
tpa: tpa:
messages: messages:
@@ -258,3 +257,25 @@ mobdrops-menu:
name: '<#00FB9A>Enderman Drops</#00FB9A>' name: '<#00FB9A>Enderman Drops</#00FB9A>'
status: '<gray>Current status: {status}</gray>' status: '<gray>Current status: {status}</gray>'
toggle: '<gray>Click to toggle</gray>' toggle: '<gray>Click to toggle</gray>'
maintenance:
status:
enabled: '<#FF7E5E>Enabled</#FF7E5E>'
disabled: '<#00FB9A>Disabled</#00FB9A>'
address-hidden: 'hidden'
messages:
enabled: '<#00FB9A>Maintenance mode enabled.</#00FB9A>'
disabled: '<#FF7E5E>Maintenance mode disabled.</#FF7E5E>'
reloaded: '<#00FB9A>Maintenance configuration reloaded.</#00FB9A>'
save-failed: '<#FF3300>Error:</#FF3300> <#FF7E5E>Failed to save maintenance configuration; no changes were applied.</#FF7E5E>'
status: '<gray>Maintenance mode status: {status} | Whitelist: <white>{whitelist_count}</white></gray>'
usage: '<#FF3300>Error:</#FF3300> <#FF7E5E>Usage: /maintenance [on|off|status|reload|add|remove|list]</#FF7E5E>'
add-usage: '<#FF3300>Error:</#FF3300> <#FF7E5E>Usage: /maintenance add [player|uuid]</#FF7E5E>'
remove-usage: '<#FF3300>Error:</#FF3300> <#FF7E5E>Usage: /maintenance remove [player|uuid]</#FF7E5E>'
whitelist-added: '<#00FB9A>Added {player} to the maintenance whitelist.</#00FB9A>'
whitelist-removed: '<#00FB9A>Removed {player} from the maintenance whitelist.</#00FB9A>'
whitelist-exists: '<#FFC43B>{player} is already on the maintenance whitelist.</#FFC43B>'
whitelist-missing: '<#FF3300>Error:</#FF3300> <#FF7E5E>{player} is not on the maintenance whitelist.</#FF7E5E>'
whitelist-empty: '<gray>The maintenance whitelist is empty.</gray>'
whitelist-list: '<gray>Maintenance whitelist ({count}): <white>{entries}</white></gray>'
login-blocked: '<#FFC43B>{player} was blocked by maintenance mode.</#FFC43B> <gray>UUID: {uuid} | IP: {address}</gray>'
+31 -10
View File
@@ -1,12 +1,11 @@
# 简体中文语言文件 # 简体中文语言文件
# 支持 MiniMessage 格式,默认使用绿色成功、红色错误灰色说明。 # 文本风格参考 HuskHomesMiniMessage绿色成功、红色错误灰色说明。
prefix: '<#00FB9A><bold>[EssentialsC]</bold></#00FB9A><gray>: </gray>' prefix: ''
messages: messages:
no-permission: '<#FF3300>错误:</#FF3300> <#FF7E5E>你没有权限执行此命令.</#FF7E5E> <gray>需要权限: {permission}</gray>' no-permission: '<#FF3300>错误:</#FF3300> <#FF7E5E>你没有权限执行此命令.</#FF7E5E> <gray>需要权限: {permission}</gray>'
player-only: '<#FF3300>错误:</#FF3300> <#FF7E5E>此命令只能由玩家执行.</#FF7E5E>' player-only: '<#FF3300>错误:</#FF3300> <#FF7E5E>此命令只能由玩家执行.</#FF7E5E>'
console-name: '控制台'
config-reloaded: '<#00FB9A>配置已重载.</#00FB9A>' config-reloaded: '<#00FB9A>配置已重载.</#00FB9A>'
version: '<#00FB9A>EssentialsC v{version}</#00FB9A>' version: '<#00FB9A>EssentialsC v{version}</#00FB9A>'
paper-version: '<gray>当前运行于 Paper {version}</gray>' paper-version: '<gray>当前运行于 Paper {version}</gray>'
@@ -50,11 +49,9 @@ messages:
heal-self: '<#00FB9A>你的生命值和饥饿值已恢复.</#00FB9A>' heal-self: '<#00FB9A>你的生命值和饥饿值已恢复.</#00FB9A>'
heal-other: '<#00FB9A>你已治疗玩家 <bold>{player}</bold>.</#00FB9A>' heal-other: '<#00FB9A>你已治疗玩家 <bold>{player}</bold>.</#00FB9A>'
heal-by-other: '<#00FB9A>管理员 <bold>{admin}</bold> 治疗了你.</#00FB9A>' heal-by-other: '<#00FB9A>管理员 <bold>{admin}</bold> 治疗了你.</#00FB9A>'
heal-usage-console: '<#FF3300>错误:</#FF3300> <#FF7E5E>用法: /heal [玩家]</#FF7E5E>'
feed-self: '<#00FB9A>你的饥饿值已恢复.</#00FB9A>' feed-self: '<#00FB9A>你的饥饿值已恢复.</#00FB9A>'
feed-other: '<#00FB9A>你已喂饱玩家 <bold>{player}</bold>.</#00FB9A>' feed-other: '<#00FB9A>你已喂饱玩家 <bold>{player}</bold>.</#00FB9A>'
feed-by-other: '<#00FB9A>管理员 <bold>{admin}</bold> 喂饱了你.</#00FB9A>' feed-by-other: '<#00FB9A>管理员 <bold>{admin}</bold> 喂饱了你.</#00FB9A>'
feed-usage-console: '<#FF3300>错误:</#FF3300> <#FF7E5E>用法: /feed [玩家]</#FF7E5E>'
repair-hand-success: '<#00FB9A>手中物品已修复.</#00FB9A>' repair-hand-success: '<#00FB9A>手中物品已修复.</#00FB9A>'
repair-all-success: '<#00FB9A>已修复 <bold>{count}</bold> 个物品.</#00FB9A>' repair-all-success: '<#00FB9A>已修复 <bold>{count}</bold> 个物品.</#00FB9A>'
repair-not-damaged: '<#FF3300>错误:</#FF3300> <#FF7E5E>该物品没有损坏.</#FF7E5E>' repair-not-damaged: '<#FF3300>错误:</#FF3300> <#FF7E5E>该物品没有损坏.</#FF7E5E>'
@@ -68,6 +65,9 @@ messages:
shulkerbox-unstack-first: '<#FF3300>错误:</#FF3300> <#FF7E5E>请先将潜影盒拆分为单个后再快捷打开.</#FF7E5E>' shulkerbox-unstack-first: '<#FF3300>错误:</#FF3300> <#FF7E5E>请先将潜影盒拆分为单个后再快捷打开.</#FF7E5E>'
shulkerbox-open-failed: '<#FF3300>错误:</#FF3300> <#FF7E5E>潜影盒打开失败,请稍后重试.</#FF7E5E>' shulkerbox-open-failed: '<#FF3300>错误:</#FF3300> <#FF7E5E>潜影盒打开失败,请稍后重试.</#FF7E5E>'
shulkerbox-session-invalid: '<#FF3300>错误:</#FF3300> <#FF7E5E>潜影盒会话异常,已停止保存以避免物品复制.</#FF7E5E>' shulkerbox-session-invalid: '<#FF3300>错误:</#FF3300> <#FF7E5E>潜影盒会话异常,已停止保存以避免物品复制.</#FF7E5E>'
jei-sync-fabric: '<#00FB9A>正在为 <bold>Fabric</bold> 客户端同步配方…</#00FB9A>'
jei-sync-neoforge: '<#00FB9A>正在为 <bold>NeoForge</bold> 客户端同步配方…</#00FB9A>'
help: help:
title: '<#00FB9A><bold>EssentialsC</bold></#00FB9A> <gray>命令帮助</gray>' title: '<#00FB9A><bold>EssentialsC</bold></#00FB9A> <gray>命令帮助</gray>'
version: '<gray>插件版本: <white>{version}</white></gray>' version: '<gray>插件版本: <white>{version}</white></gray>'
@@ -76,8 +76,6 @@ help:
footer: '<gray>每个命令都需要对应权限.</gray>' footer: '<gray>每个命令都需要对应权限.</gray>'
commands: commands:
reload: '<white>/essc reload</white> <gray>- 重载插件配置</gray>'
version: '<white>/essc version</white> <gray>- 查看插件与服务端版本</gray>'
workbench: '<white>/workbench</white> <gray>- 打开工作台</gray>' workbench: '<white>/workbench</white> <gray>- 打开工作台</gray>'
anvil: '<white>/anvil</white> <gray>- 打开铁砧</gray>' anvil: '<white>/anvil</white> <gray>- 打开铁砧</gray>'
enchantingtable: '<white>/enchantingtable</white> <gray>- 打开附魔台</gray>' enchantingtable: '<white>/enchantingtable</white> <gray>- 打开附魔台</gray>'
@@ -93,10 +91,10 @@ help:
fly: '<white>/fly</white> <gray>- 切换飞行模式</gray>' fly: '<white>/fly</white> <gray>- 切换飞行模式</gray>'
nightvision: '<white>/nightvision</white> <gray>- 切换夜视</gray>' nightvision: '<white>/nightvision</white> <gray>- 切换夜视</gray>'
glow: '<white>/glow</white> <gray>- 切换发光</gray>' glow: '<white>/glow</white> <gray>- 切换发光</gray>'
heal: '<white>/heal [玩家]</white> <gray>- 恢复生命值和饥饿值</gray>' heal: '<white>/heal</white> <gray>- 恢复生命值和饥饿值</gray>'
vanish: '<white>/vanish</white> <gray>- 切换隐身模式</gray>' vanish: '<white>/vanish</white> <gray>- 切换隐身模式</gray>'
seen: '<white>/seen [玩家]</white> <gray>- 查看玩家信息</gray>' seen: '<white>/seen</white> <gray>- 查看玩家信息</gray>'
feed: '<white>/feed [玩家]</white> <gray>- 恢复饥饿值</gray>' feed: '<white>/feed</white> <gray>- 恢复饥饿值</gray>'
repair: '<white>/repair</white> <gray>- 修复手中或全部物品</gray>' repair: '<white>/repair</white> <gray>- 修复手中或全部物品</gray>'
tpa: '<white>/tpa [玩家]</white> <gray>- 请求传送到玩家身边</gray>' tpa: '<white>/tpa [玩家]</white> <gray>- 请求传送到玩家身边</gray>'
tpahere: '<white>/tpahere [玩家]</white> <gray>- 请求玩家传送到你身边</gray>' tpahere: '<white>/tpahere [玩家]</white> <gray>- 请求玩家传送到你身边</gray>'
@@ -107,6 +105,7 @@ help:
skin: '<white>/essc skin [status|refresh] [玩家]</white> <gray>- 查看或刷新皮肤桥接状态</gray>' skin: '<white>/essc skin [status|refresh] [玩家]</white> <gray>- 查看或刷新皮肤桥接状态</gray>'
admin: '<white>/essc admin</white> <gray>- 切换管理模式</gray>' admin: '<white>/essc admin</white> <gray>- 切换管理模式</gray>'
tpsbar: '<white>/tpsbar [玩家]</white> <gray>- 切换 TPS 状态栏</gray>' tpsbar: '<white>/tpsbar [玩家]</white> <gray>- 切换 TPS 状态栏</gray>'
maintenance: '<white>/maintenance [on|off|status|reload|add|remove|list]</white> <gray>- 管理维护模式</gray>'
tpa: tpa:
messages: messages:
@@ -258,3 +257,25 @@ mobdrops-menu:
name: '<#00FB9A>末影人掉落</#00FB9A>' name: '<#00FB9A>末影人掉落</#00FB9A>'
status: '<gray>当前状态: {status}</gray>' status: '<gray>当前状态: {status}</gray>'
toggle: '<gray>点击切换</gray>' toggle: '<gray>点击切换</gray>'
maintenance:
status:
enabled: '<#FF7E5E>开启</#FF7E5E>'
disabled: '<#00FB9A>关闭</#00FB9A>'
address-hidden: '已隐藏'
messages:
enabled: '<#00FB9A>维护模式已开启.</#00FB9A>'
disabled: '<#FF7E5E>维护模式已关闭.</#FF7E5E>'
reloaded: '<#00FB9A>维护模式配置已重载.</#00FB9A>'
save-failed: '<#FF3300>错误:</#FF3300> <#FF7E5E>维护模式配置保存失败,操作未生效.</#FF7E5E>'
status: '<gray>维护模式当前状态: {status} | 白名单: <white>{whitelist_count}</white></gray>'
usage: '<#FF3300>错误:</#FF3300> <#FF7E5E>用法: /maintenance [on|off|status|reload|add|remove|list]</#FF7E5E>'
add-usage: '<#FF3300>错误:</#FF3300> <#FF7E5E>用法: /maintenance add [玩家|UUID]</#FF7E5E>'
remove-usage: '<#FF3300>错误:</#FF3300> <#FF7E5E>用法: /maintenance remove [玩家|UUID]</#FF7E5E>'
whitelist-added: '<#00FB9A>已将 {player} 加入维护白名单.</#00FB9A>'
whitelist-removed: '<#00FB9A>已将 {player} 移出维护白名单.</#00FB9A>'
whitelist-exists: '<#FFC43B>{player} 已在维护白名单中.</#FFC43B>'
whitelist-missing: '<#FF3300>错误:</#FF3300> <#FF7E5E>{player} 不在维护白名单中.</#FF7E5E>'
whitelist-empty: '<gray>维护白名单为空.</gray>'
whitelist-list: '<gray>维护白名单 ({count}): <white>{entries}</white></gray>'
login-blocked: '<#FFC43B>{player} 被维护模式拦截.</#FFC43B> <gray>UUID: {uuid} | IP: {address}</gray>'
+45
View File
@@ -0,0 +1,45 @@
# EssentialsC 维护模式配置
config-version: 1
# 是否开启维护模式。
enabled: false
# 拥有该权限的玩家可以在维护模式下进入服务器。
bypass-permission: "essentialsc.maintenance.bypass"
notify:
# 玩家因维护模式被拒绝进入时,是否通知在线管理员。
enabled: true
# 拥有该权限的在线玩家会收到拦截通知。
permission: "essentialsc.maintenance.notify"
# 是否在通知中显示玩家 IP 地址;出于隐私考虑默认关闭。
include-address: false
whitelist:
# 这些 UUID 可以在维护模式下进入服务器。
uuids: []
# 这些玩家名可以在维护模式下进入服务器。大小写不敏感。
names: []
motd:
# 维护模式开启时是否替换服务器列表 MOTD。
enabled: true
lines:
- "&c服务器维护中"
- "&7请稍后再试"
kick-message:
- "&c服务器正在维护"
- "&7请稍后再进入"
bossbar:
# 维护模式开启时是否向所有在线玩家显示 BossBar。
enabled: true
title: "&c服务器正在维护"
# 可选值:PINK / BLUE / RED / GREEN / YELLOW / PURPLE / WHITE
color: RED
# 可选值:SOLID / SEGMENTED_6 / SEGMENTED_10 / SEGMENTED_12 / SEGMENTED_20
style: SOLID
# 进度范围:0.0 - 1.0
progress: 1.0
+7 -1
View File
@@ -1,7 +1,7 @@
# EssentialsC 模块配置 # EssentialsC 模块配置
# #
# modules.yml 用于控制功能模块是否在运行时加载。 # modules.yml 用于控制功能模块是否在运行时加载。
# 各功能的详细设置位于 config.yml 与 blocks-menu.yml。 # 各功能的详细设置位于 config.yml、maintenance.yml 与 blocks-menu.yml。
# #
# 修改模块开关后可使用 /essc reload 刷新运行期服务和监听器。 # 修改模块开关后可使用 /essc reload 刷新运行期服务和监听器。
# 直连命令的完整热增删仍建议通过重启服务器完成。 # 直连命令的完整热增删仍建议通过重启服务器完成。
@@ -18,9 +18,15 @@ modules:
tpsbar: tpsbar:
# 插件版 TPSBar。检测到服务端原生命令时会自动避免冲突。 # 插件版 TPSBar。检测到服务端原生命令时会自动避免冲突。
enabled: true enabled: true
jei-sync:
# Fabric / NeoForge JEI 配方同步兼容修复。
enabled: true
mob-drops: mob-drops:
# 末影人掉落控制菜单和监听器;具体掉落状态可在游戏内切换。 # 末影人掉落控制菜单和监听器;具体掉落状态可在游戏内切换。
enabled: false enabled: false
maintenance:
# 维护模式。开启维护后可替换 MOTD,并阻止无绕过权限的玩家进入。
enabled: true
skin-bridge: skin-bridge:
# 查询外置 Yggdrasil profile,并通过 MineSkin 与 Paper Profile API 同步皮肤。 # 查询外置 Yggdrasil profile,并通过 MineSkin 与 Paper Profile API 同步皮肤。
enabled: false enabled: false
+21 -2
View File
@@ -1,5 +1,5 @@
name: EssentialsC name: EssentialsC
description: 高版本基础工具箱 description: 适用于 Paper 服务端的轻量基础功能插件。
version: ${version} version: ${version}
main: cn.infstar.essentialsC.EssentialsC main: cn.infstar.essentialsC.EssentialsC
@@ -7,6 +7,13 @@ api-version: '1.21.11'
load: POSTWORLD load: POSTWORLD
folia-supported: false folia-supported: false
dependencies:
server:
LuckPerms:
load: BEFORE
required: false
join-classpath: true
authors: [ Coldsmiles_7 ] authors: [ Coldsmiles_7 ]
website: www.infstar.cn website: www.infstar.cn
@@ -119,6 +126,9 @@ permissions:
essentialsc.command.tpsbar.others: essentialsc.command.tpsbar.others:
description: 允许为其他玩家切换 /tpsbar description: 允许为其他玩家切换 /tpsbar
default: op default: op
essentialsc.command.maintenance:
description: 允许管理维护模式
default: op
essentialsc.command.skin: essentialsc.command.skin:
description: 允许使用 SkinBridge 管理命令 description: 允许使用 SkinBridge 管理命令
default: op default: op
@@ -135,11 +145,17 @@ permissions:
essentialsc.command.skin.others: essentialsc.command.skin.others:
description: 允许查看或刷新其他玩家的皮肤 description: 允许查看或刷新其他玩家的皮肤
default: op default: op
essentialsc.maintenance.bypass:
description: 允许在维护模式下进入服务器
default: op
essentialsc.maintenance.notify:
description: 允许接收维护模式拦截通知
default: op
essentialsc.shulkerbox.open: essentialsc.shulkerbox.open:
description: 允许通过 Shift+右键快捷打开潜影盒 description: 允许通过 Shift+右键快捷打开潜影盒
default: op default: op
essentialsc.mobdrops.enderman: essentialsc.mobdrops.enderman:
description: 允许控制末影人死亡时是否掉落物品 description: 允许控制末影人掉落方块
default: op default: op
essentialsc.*: essentialsc.*:
description: 授予 EssentialsC 的全部权限 description: 授予 EssentialsC 的全部权限
@@ -181,9 +197,12 @@ permissions:
essentialsc.command.reload: true essentialsc.command.reload: true
essentialsc.command.tpsbar: true essentialsc.command.tpsbar: true
essentialsc.command.tpsbar.others: true essentialsc.command.tpsbar.others: true
essentialsc.command.maintenance: true
essentialsc.command.skin: true essentialsc.command.skin: true
essentialsc.command.skin.status: true essentialsc.command.skin.status: true
essentialsc.command.skin.refresh: true essentialsc.command.skin.refresh: true
essentialsc.command.skin.others: true essentialsc.command.skin.others: true
essentialsc.maintenance.bypass: true
essentialsc.maintenance.notify: true
essentialsc.shulkerbox.open: true essentialsc.shulkerbox.open: true
essentialsc.mobdrops.enderman: true essentialsc.mobdrops.enderman: true
@@ -4,17 +4,13 @@ import org.bukkit.configuration.file.YamlConfiguration;
import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource; import org.junit.jupiter.params.provider.ValueSource;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
class ConfigurationResourcesTest { class ConfigurationResourcesTest {
@@ -23,6 +19,7 @@ class ConfigurationResourcesTest {
@ValueSource(strings = { @ValueSource(strings = {
"config.yml", "config.yml",
"modules.yml", "modules.yml",
"maintenance.yml",
"blocks-menu.yml", "blocks-menu.yml",
"paper-plugin.yml", "paper-plugin.yml",
"lang/zh_CN.yml", "lang/zh_CN.yml",
@@ -43,9 +40,6 @@ class ConfigurationResourcesTest {
if (resourcePath.equals("paper-plugin.yml")) { if (resourcePath.equals("paper-plugin.yml")) {
assertEquals("1.21.11", configuration.getString("api-version")); assertEquals("1.21.11", configuration.getString("api-version"));
} }
if (resourcePath.startsWith("lang/")) {
assertTrue(!configuration.getString("prefix", "").isBlank());
}
} }
} }
@@ -57,49 +51,6 @@ class ConfigurationResourcesTest {
assertEquals(chinese.getKeys(true), english.getKeys(true)); assertEquals(chinese.getKeys(true), english.getKeys(true));
} }
@Test
void retiredJeiFeatureIsAbsentFromResources() throws Exception {
assertFalse(loadResource("config.yml").contains("jei-sync", true));
assertFalse(loadResource("modules.yml").contains("modules.jei-sync", true));
assertFalse(loadResource("lang/zh_CN.yml").contains("messages.jei-sync-fabric", true));
assertFalse(loadResource("lang/zh_CN.yml").contains("messages.jei-sync-neoforge", true));
assertFalse(loadResource("lang/en_US.yml").contains("messages.jei-sync-fabric", true));
assertFalse(loadResource("lang/en_US.yml").contains("messages.jei-sync-neoforge", true));
}
@Test
void retiredMaintenanceFeatureIsAbsentFromResources() throws Exception {
assertNull(getClass().getClassLoader().getResource("maintenance.yml"));
assertFalse(loadResource("modules.yml").contains("modules.maintenance", true));
assertFalse(loadResource("paper-plugin.yml").contains("dependencies.server.LuckPerms", true));
assertFalse(loadResource("paper-plugin.yml").contains("permissions.essentialsc.command.maintenance", true));
assertFalse(loadResource("paper-plugin.yml").contains("permissions.essentialsc.maintenance.bypass", true));
assertFalse(loadResource("paper-plugin.yml").contains("permissions.essentialsc.maintenance.notify", true));
assertFalse(loadResource("lang/zh_CN.yml").contains("maintenance", true));
assertFalse(loadResource("lang/en_US.yml").contains("maintenance", true));
assertNull(cn.infstar.essentialsC.commands.CommandRegistry.resolveCommandName("maintenance"));
assertNull(cn.infstar.essentialsC.commands.CommandRegistry.resolveCommandName("maint"));
}
@Test
void miniMessageTagNamesAreNormalized() {
assertEquals("<gray>文本</gray>", LangManager.normalizeMiniMessageTags("<GRAY>文本</GRAY>"));
assertEquals("\\<GRAY>", LangManager.normalizeMiniMessageTags("\\<GRAY>"));
}
@Test
void legacyFormattingCanBeNestedInMiniMessage() {
String message = LangManager.applyPlaceholders(
"<gray>维护状态: {status}</gray>",
java.util.Map.of("status", "§a开启")
);
String rendered = PlainTextComponentSerializer.plainText().serialize(
MiniMessage.miniMessage().deserialize(message)
);
assertEquals("维护状态: 开启", rendered);
}
private YamlConfiguration loadResource(String resourcePath) throws Exception { private YamlConfiguration loadResource(String resourcePath) throws Exception {
try (InputStream input = getClass().getClassLoader().getResourceAsStream(resourcePath)) { try (InputStream input = getClass().getClassLoader().getResourceAsStream(resourcePath)) {
assertNotNull(input, resourcePath); assertNotNull(input, resourcePath);
@@ -0,0 +1,23 @@
package cn.infstar.essentialsC.compat.jei;
import org.junit.jupiter.api.Test;
import java.util.List;
import java.util.Map;
import static org.junit.jupiter.api.Assertions.assertEquals;
class RecipeGroupingTest {
@Test
void groupsValuesInOnePassAndPreservesOrder() {
List<String> recipes = List.of("crafting:first", "smelting:second", "crafting:third");
Map<String, List<String>> grouped = RecipeGrouping.groupBy(
recipes, value -> value.substring(0, value.indexOf(':')));
assertEquals(List.of("crafting", "smelting"), grouped.keySet().stream().toList());
assertEquals(List.of("crafting:first", "crafting:third"), grouped.get("crafting"));
assertEquals(List.of("smelting:second"), grouped.get("smelting"));
}
}
+27
View File
@@ -0,0 +1,27 @@
plugins {
id 'java-library'
id 'io.papermc.paperweight.userdev'
}
repositories {
mavenCentral()
maven {
name = 'papermc'
url = uri('https://repo.papermc.io/repository/maven-public/')
}
}
dependencies {
api project(':compat-api')
paperweight.paperDevBundle('1.21.11-R0.1-SNAPSHOT')
}
java {
toolchain.languageVersion.set(JavaLanguageVersion.of(21))
}
paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.getMOJANG_PRODUCTION()
tasks.withType(JavaCompile).configureEach {
options.encoding = 'UTF-8'
}
@@ -0,0 +1,269 @@
package cn.infstar.essentialsC.v1_21_11.jei;
import cn.infstar.essentialsC.compat.jei.JeiRecipeSyncAdapter;
import cn.infstar.essentialsC.compat.jei.RecipeGrouping;
import io.netty.buffer.Unpooled;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.network.RegistryFriendlyByteBuf;
import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket;
import net.minecraft.network.protocol.common.custom.DiscardedPayload;
import net.minecraft.resources.Identifier;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.item.crafting.RecipeHolder;
import net.minecraft.world.item.crafting.RecipeMap;
import net.minecraft.world.item.crafting.RecipeSerializer;
import org.bukkit.craftbukkit.entity.CraftPlayer;
import org.bukkit.entity.Player;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.logging.Logger;
public final class JeiRecipeSyncAdapterImpl implements JeiRecipeSyncAdapter {
private DiscardedPayload fabricPayloadCache;
private DiscardedPayload neoForgePayloadCache;
@Override
@SuppressWarnings({"unchecked", "deprecation"})
public void sendFabricRecipeSync(Player player, Logger logger, boolean debug) {
ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle();
MinecraftServer server = serverPlayer.level().getServer();
if (server == null) {
if (debug) {
logger.warning("服务端实例为 null");
}
return;
}
if (fabricPayloadCache != null) {
serverPlayer.connection.send(new ClientboundCustomPayloadPacket(fabricPayloadCache));
return;
}
RecipeMap recipeMap = server.getRecipeManager().recipes;
if (debug) {
logger.info("开始构建 Fabric 配方数据");
}
var list = new ArrayList<FabricRecipeEntry>();
var seen = new HashSet<RecipeSerializer<?>>();
var groupedRecipes = RecipeGrouping.groupBy(
recipeMap.values(), holder -> holder.value().getSerializer());
for (RecipeSerializer<?> serializer : BuiltInRegistries.RECIPE_SERIALIZER) {
if (!seen.add(serializer)) {
continue;
}
List<RecipeHolder<?>> recipes = groupedRecipes.get(serializer);
if (recipes != null && !recipes.isEmpty()) {
RecipeSerializer<?> entrySerializer = recipes.get(0).value().getSerializer();
list.add(new FabricRecipeEntry(entrySerializer, recipes));
}
}
var payload = new FabricRecipeSyncPayload(list);
if (debug) {
logger.info("Fabric 配方条目数: " + list.size());
}
RegistryFriendlyByteBuf buffer = new RegistryFriendlyByteBuf(Unpooled.buffer(), server.registryAccess());
byte[] bytes;
try {
getFabricCodec().encode(buffer, payload);
bytes = new byte[buffer.writerIndex()];
buffer.getBytes(0, bytes);
} finally {
buffer.release();
}
Identifier id = Identifier.fromNamespaceAndPath("fabric", "recipe_sync");
DiscardedPayload discardedPayload = new DiscardedPayload(id, bytes);
fabricPayloadCache = discardedPayload;
serverPlayer.connection.send(new ClientboundCustomPayloadPacket(discardedPayload));
if (debug) {
logger.info("已发送 Fabric 配方同步 [" + id + "], 大小: " + bytes.length + " bytes");
}
}
@Override
@SuppressWarnings({"unchecked", "deprecation"})
public void sendNeoForgeRecipeSync(Player player, Logger logger, boolean debug) {
ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle();
MinecraftServer server = serverPlayer.level().getServer();
if (server == null) {
if (debug) {
logger.warning("服务端实例为 null");
}
return;
}
if (neoForgePayloadCache != null) {
serverPlayer.connection.send(new ClientboundCustomPayloadPacket(neoForgePayloadCache));
sendTags(serverPlayer, server);
return;
}
RecipeMap recipeMap = server.getRecipeManager().recipes;
if (debug) {
logger.info("开始构建 NeoForge 配方数据");
}
java.util.List<net.minecraft.world.item.crafting.RecipeType<?>> allRecipeTypes =
BuiltInRegistries.RECIPE_TYPE.stream().toList();
if (debug) {
logger.info("NeoForge 配方类型数: " + allRecipeTypes.size());
}
var payload = createNeoForgePayload(allRecipeTypes, recipeMap);
RegistryFriendlyByteBuf buffer = new RegistryFriendlyByteBuf(Unpooled.buffer(), server.registryAccess());
byte[] bytes;
try {
getNeoForgeStreamCodec().encode(buffer, payload);
bytes = new byte[buffer.writerIndex()];
buffer.getBytes(0, bytes);
} finally {
buffer.release();
}
Identifier id = Identifier.fromNamespaceAndPath("neoforge", "recipe_content");
DiscardedPayload discardedPayload = new DiscardedPayload(id, bytes);
neoForgePayloadCache = discardedPayload;
serverPlayer.connection.send(new ClientboundCustomPayloadPacket(discardedPayload));
sendTags(serverPlayer, server);
if (debug) {
logger.info("已发送 NeoForge 配方同步 [" + id + "], 大小: " + bytes.length + " bytes");
}
}
@Override
public void clearCache() {
fabricPayloadCache = null;
neoForgePayloadCache = null;
}
private void sendTags(ServerPlayer serverPlayer, MinecraftServer server) {
serverPlayer.connection.send(new net.minecraft.network.protocol.common.ClientboundUpdateTagsPacket(
net.minecraft.tags.TagNetworkSerialization.serializeTagsToNetwork(server.registries())
));
}
@SuppressWarnings({"unchecked", "deprecation"})
private net.minecraft.network.codec.StreamCodec<RegistryFriendlyByteBuf, FabricRecipeSyncPayload> getFabricCodec() {
return FabricRecipeEntry.CODEC.apply(net.minecraft.network.codec.ByteBufCodecs.list())
.map(FabricRecipeSyncPayload::new, FabricRecipeSyncPayload::entries);
}
private NeoForgeRecipeSyncPayload createNeoForgePayload(
java.util.List<net.minecraft.world.item.crafting.RecipeType<?>> recipeTypes,
RecipeMap recipeMap
) {
var recipeTypeSet = new java.util.HashSet<>(recipeTypes);
if (recipeTypeSet.isEmpty()) {
return new NeoForgeRecipeSyncPayload(recipeTypeSet, java.util.List.of());
}
var recipeSubset = recipeMap.values().stream()
.filter(h -> recipeTypeSet.contains(h.value().getType()))
.toList();
return new NeoForgeRecipeSyncPayload(recipeTypeSet, recipeSubset);
}
@SuppressWarnings({"unchecked", "deprecation"})
private net.minecraft.network.codec.StreamCodec<RegistryFriendlyByteBuf, NeoForgeRecipeSyncPayload> getNeoForgeStreamCodec() {
return net.minecraft.network.codec.StreamCodec.composite(
net.minecraft.network.codec.ByteBufCodecs.registry(net.minecraft.core.registries.Registries.RECIPE_TYPE)
.apply(net.minecraft.network.codec.ByteBufCodecs.collection(java.util.HashSet::new)),
NeoForgeRecipeSyncPayload::recipeTypes,
RecipeHolder.STREAM_CODEC.apply(net.minecraft.network.codec.ByteBufCodecs.list()),
NeoForgeRecipeSyncPayload::recipes,
NeoForgeRecipeSyncPayload::new
);
}
@SuppressWarnings("deprecation")
private static class FabricRecipeEntry {
final Object serializer;
final List<RecipeHolder<?>> recipes;
FabricRecipeEntry(Object serializer, List<RecipeHolder<?>> recipes) {
this.serializer = serializer;
this.recipes = recipes;
}
static final net.minecraft.network.codec.StreamCodec<RegistryFriendlyByteBuf, FabricRecipeEntry> CODEC =
net.minecraft.network.codec.StreamCodec.ofMember(
FabricRecipeEntry::write,
FabricRecipeEntry::read
);
@SuppressWarnings("unchecked")
private static FabricRecipeEntry read(RegistryFriendlyByteBuf buf) {
Identifier recipeSerializerId = buf.readIdentifier();
RecipeSerializer<?> recipeSerializer = BuiltInRegistries.RECIPE_SERIALIZER.getValue(recipeSerializerId);
if (recipeSerializer == null) {
throw new RuntimeException("Tried syncing unsupported packet serializer '" + recipeSerializerId + "'!");
}
int count = buf.readVarInt();
var list = new ArrayList<RecipeHolder<?>>();
for (int i = 0; i < count; i++) {
net.minecraft.resources.ResourceKey<net.minecraft.world.item.crafting.Recipe<?>> id =
buf.readResourceKey(net.minecraft.core.registries.Registries.RECIPE);
try {
var streamCodecMethod = recipeSerializer.getClass().getMethod("streamCodec");
var streamCodec = streamCodecMethod.invoke(recipeSerializer);
net.minecraft.world.item.crafting.Recipe<?> recipe =
((net.minecraft.network.codec.StreamCodec<RegistryFriendlyByteBuf, net.minecraft.world.item.crafting.Recipe<?>>) streamCodec)
.decode(buf);
list.add(new RecipeHolder<>(id, recipe));
} catch (Exception e) {
throw new RuntimeException("Failed to decode recipe: " + e.getMessage(), e);
}
}
return new FabricRecipeEntry(recipeSerializer, list);
}
private void write(RegistryFriendlyByteBuf buf) {
try {
var getKeyMethod = BuiltInRegistries.RECIPE_SERIALIZER.getClass().getMethod("getKey", Object.class);
Identifier identifier = (Identifier) getKeyMethod.invoke(BuiltInRegistries.RECIPE_SERIALIZER, this.serializer);
buf.writeIdentifier(identifier);
} catch (Exception e) {
throw new RuntimeException("Failed to get serializer key: " + e.getMessage(), e);
}
buf.writeVarInt(this.recipes.size());
try {
var streamCodecMethod = this.serializer.getClass().getMethod("streamCodec");
@SuppressWarnings("unchecked")
var codec = (net.minecraft.network.codec.StreamCodec<RegistryFriendlyByteBuf, net.minecraft.world.item.crafting.Recipe<?>>)
streamCodecMethod.invoke(this.serializer);
for (RecipeHolder<?> recipe : this.recipes) {
buf.writeResourceKey(recipe.id());
codec.encode(buf, recipe.value());
}
} catch (Exception e) {
throw new RuntimeException("Failed to encode recipe: " + e.getMessage(), e);
}
}
}
private record FabricRecipeSyncPayload(List<FabricRecipeEntry> entries) {
}
private record NeoForgeRecipeSyncPayload(
java.util.Set<net.minecraft.world.item.crafting.RecipeType<?>> recipeTypes,
java.util.List<RecipeHolder<?>> recipes
) {
}
}
+34
View File
@@ -0,0 +1,34 @@
import org.gradle.api.attributes.java.TargetJvmVersion
plugins {
id 'java-library'
id 'io.papermc.paperweight.userdev'
}
repositories {
mavenCentral()
maven {
name = 'papermc'
url = uri('https://repo.papermc.io/repository/maven-public/')
}
}
dependencies {
api project(':compat-api')
paperweight.paperDevBundle('26.1.2.build.74-stable')
}
java {
toolchain.languageVersion.set(JavaLanguageVersion.of(25))
}
configurations.configureEach {
attributes.attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 25)
}
paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.getMOJANG_PRODUCTION()
tasks.withType(JavaCompile).configureEach {
options.encoding = 'UTF-8'
options.release.set(21)
}
@@ -0,0 +1,270 @@
package cn.infstar.essentialsC.v26_1_2.jei;
import cn.infstar.essentialsC.compat.jei.JeiRecipeSyncAdapter;
import cn.infstar.essentialsC.compat.jei.RecipeGrouping;
import io.netty.buffer.Unpooled;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.network.RegistryFriendlyByteBuf;
import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket;
import net.minecraft.network.protocol.common.custom.DiscardedPayload;
import net.minecraft.resources.Identifier;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.item.crafting.RecipeHolder;
import net.minecraft.world.item.crafting.RecipeMap;
import net.minecraft.world.item.crafting.RecipeSerializer;
import org.bukkit.craftbukkit.entity.CraftPlayer;
import org.bukkit.entity.Player;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.logging.Logger;
public final class JeiRecipeSyncAdapterImpl implements JeiRecipeSyncAdapter {
private DiscardedPayload fabricPayloadCache;
private DiscardedPayload neoForgePayloadCache;
@Override
@SuppressWarnings({"unchecked", "deprecation"})
public void sendFabricRecipeSync(Player player, Logger logger, boolean debug) {
ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle();
MinecraftServer server = serverPlayer.level().getServer();
if (server == null) {
if (debug) {
logger.warning("服务端实例为 null");
}
return;
}
if (fabricPayloadCache != null) {
serverPlayer.connection.send(new ClientboundCustomPayloadPacket(fabricPayloadCache));
return;
}
RecipeMap recipeMap = server.getRecipeManager().recipes;
if (debug) {
logger.info("开始构建 Fabric 配方数据");
}
var list = new ArrayList<FabricRecipeEntry>();
var seen = new HashSet<RecipeSerializer<?>>();
var groupedRecipes = RecipeGrouping.groupBy(
recipeMap.values(), holder -> holder.value().getSerializer());
for (RecipeSerializer<?> serializer : BuiltInRegistries.RECIPE_SERIALIZER) {
if (!seen.add(serializer)) {
continue;
}
List<RecipeHolder<?>> recipes = groupedRecipes.get(serializer);
if (recipes != null && !recipes.isEmpty()) {
RecipeSerializer<?> entrySerializer = recipes.get(0).value().getSerializer();
list.add(new FabricRecipeEntry(entrySerializer, recipes));
}
}
var payload = new FabricRecipeSyncPayload(list);
if (debug) {
logger.info("Fabric 配方条目数: " + list.size());
}
RegistryFriendlyByteBuf buffer = new RegistryFriendlyByteBuf(Unpooled.buffer(), server.registryAccess());
byte[] bytes;
try {
getFabricCodec().encode(buffer, payload);
bytes = new byte[buffer.writerIndex()];
buffer.getBytes(0, bytes);
} finally {
buffer.release();
}
Identifier id = Identifier.fromNamespaceAndPath("fabric", "recipe_sync");
DiscardedPayload discardedPayload = new DiscardedPayload(id, bytes);
fabricPayloadCache = discardedPayload;
serverPlayer.connection.send(new ClientboundCustomPayloadPacket(discardedPayload));
if (debug) {
logger.info("已发送 Fabric 配方同步 [" + id + "], 大小: " + bytes.length + " bytes");
}
}
@Override
@SuppressWarnings({"unchecked", "deprecation"})
public void sendNeoForgeRecipeSync(Player player, Logger logger, boolean debug) {
ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle();
MinecraftServer server = serverPlayer.level().getServer();
if (server == null) {
if (debug) {
logger.warning("服务端实例为 null");
}
return;
}
if (neoForgePayloadCache != null) {
serverPlayer.connection.send(new ClientboundCustomPayloadPacket(neoForgePayloadCache));
sendTags(serverPlayer, server);
return;
}
RecipeMap recipeMap = server.getRecipeManager().recipes;
if (debug) {
logger.info("开始构建 NeoForge 配方数据");
}
java.util.List<net.minecraft.world.item.crafting.RecipeType<?>> allRecipeTypes =
BuiltInRegistries.RECIPE_TYPE.stream().toList();
if (debug) {
logger.info("NeoForge 配方类型数: " + allRecipeTypes.size());
}
var payload = createNeoForgePayload(allRecipeTypes, recipeMap);
RegistryFriendlyByteBuf buffer = new RegistryFriendlyByteBuf(Unpooled.buffer(), server.registryAccess());
byte[] bytes;
try {
getNeoForgeStreamCodec().encode(buffer, payload);
bytes = new byte[buffer.writerIndex()];
buffer.getBytes(0, bytes);
} finally {
buffer.release();
}
Identifier id = Identifier.fromNamespaceAndPath("neoforge", "recipe_content");
DiscardedPayload discardedPayload = new DiscardedPayload(id, bytes);
neoForgePayloadCache = discardedPayload;
serverPlayer.connection.send(new ClientboundCustomPayloadPacket(discardedPayload));
sendTags(serverPlayer, server);
if (debug) {
logger.info("已发送 NeoForge 配方同步 [" + id + "], 大小: " + bytes.length + " bytes");
}
}
@Override
public void clearCache() {
fabricPayloadCache = null;
neoForgePayloadCache = null;
}
private void sendTags(ServerPlayer serverPlayer, MinecraftServer server) {
serverPlayer.connection.send(new net.minecraft.network.protocol.common.ClientboundUpdateTagsPacket(
net.minecraft.tags.TagNetworkSerialization.serializeTagsToNetwork(server.registries())
));
}
@SuppressWarnings({"unchecked", "deprecation"})
private net.minecraft.network.codec.StreamCodec<RegistryFriendlyByteBuf, FabricRecipeSyncPayload> getFabricCodec() {
return FabricRecipeEntry.CODEC.apply(net.minecraft.network.codec.ByteBufCodecs.list())
.map(FabricRecipeSyncPayload::new, FabricRecipeSyncPayload::entries);
}
private NeoForgeRecipeSyncPayload createNeoForgePayload(
java.util.List<net.minecraft.world.item.crafting.RecipeType<?>> recipeTypes,
RecipeMap recipeMap
) {
var recipeTypeSet = new java.util.HashSet<>(recipeTypes);
if (recipeTypeSet.isEmpty()) {
return new NeoForgeRecipeSyncPayload(recipeTypeSet, java.util.List.of());
}
var recipeSubset = recipeMap.values().stream()
.filter(h -> recipeTypeSet.contains(h.value().getType()))
.toList();
return new NeoForgeRecipeSyncPayload(recipeTypeSet, recipeSubset);
}
@SuppressWarnings({"unchecked", "deprecation"})
private net.minecraft.network.codec.StreamCodec<RegistryFriendlyByteBuf, NeoForgeRecipeSyncPayload> getNeoForgeStreamCodec() {
return net.minecraft.network.codec.StreamCodec.composite(
net.minecraft.network.codec.ByteBufCodecs.registry(net.minecraft.core.registries.Registries.RECIPE_TYPE)
.apply(net.minecraft.network.codec.ByteBufCodecs.collection(java.util.HashSet::new)),
NeoForgeRecipeSyncPayload::recipeTypes,
RecipeHolder.STREAM_CODEC.apply(net.minecraft.network.codec.ByteBufCodecs.list()),
NeoForgeRecipeSyncPayload::recipes,
NeoForgeRecipeSyncPayload::new
);
}
@SuppressWarnings("deprecation")
private static class FabricRecipeEntry {
final Object serializer;
final List<RecipeHolder<?>> recipes;
FabricRecipeEntry(Object serializer, List<RecipeHolder<?>> recipes) {
this.serializer = serializer;
this.recipes = recipes;
}
static final net.minecraft.network.codec.StreamCodec<RegistryFriendlyByteBuf, FabricRecipeEntry> CODEC =
net.minecraft.network.codec.StreamCodec.ofMember(
FabricRecipeEntry::write,
FabricRecipeEntry::read
);
@SuppressWarnings("unchecked")
private static FabricRecipeEntry read(RegistryFriendlyByteBuf buf) {
Identifier recipeSerializerId = buf.readIdentifier();
RecipeSerializer<?> recipeSerializer = BuiltInRegistries.RECIPE_SERIALIZER.getValue(recipeSerializerId);
if (recipeSerializer == null) {
throw new RuntimeException("Tried syncing unsupported packet serializer '" + recipeSerializerId + "'!");
}
int count = buf.readVarInt();
var list = new ArrayList<RecipeHolder<?>>();
for (int i = 0; i < count; i++) {
net.minecraft.resources.ResourceKey<net.minecraft.world.item.crafting.Recipe<?>> id =
buf.readResourceKey(net.minecraft.core.registries.Registries.RECIPE);
try {
var streamCodecMethod = recipeSerializer.getClass().getMethod("streamCodec");
var streamCodec = streamCodecMethod.invoke(recipeSerializer);
net.minecraft.world.item.crafting.Recipe<?> recipe =
((net.minecraft.network.codec.StreamCodec<RegistryFriendlyByteBuf, net.minecraft.world.item.crafting.Recipe<?>>) streamCodec)
.decode(buf);
list.add(new RecipeHolder<>(id, recipe));
} catch (Exception e) {
throw new RuntimeException("Failed to decode recipe: " + e.getMessage(), e);
}
}
return new FabricRecipeEntry(recipeSerializer, list);
}
private void write(RegistryFriendlyByteBuf buf) {
try {
var getKeyMethod = BuiltInRegistries.RECIPE_SERIALIZER.getClass().getMethod("getKey", Object.class);
Identifier identifier = (Identifier) getKeyMethod.invoke(BuiltInRegistries.RECIPE_SERIALIZER, this.serializer);
buf.writeIdentifier(identifier);
} catch (Exception e) {
throw new RuntimeException("Failed to get serializer key: " + e.getMessage(), e);
}
buf.writeVarInt(this.recipes.size());
try {
var streamCodecMethod = this.serializer.getClass().getMethod("streamCodec");
@SuppressWarnings("unchecked")
var codec = (net.minecraft.network.codec.StreamCodec<RegistryFriendlyByteBuf, net.minecraft.world.item.crafting.Recipe<?>>)
streamCodecMethod.invoke(this.serializer);
for (RecipeHolder<?> recipe : this.recipes) {
buf.writeResourceKey(recipe.id());
codec.encode(buf, recipe.value());
}
} catch (Exception e) {
throw new RuntimeException("Failed to encode recipe: " + e.getMessage(), e);
}
}
}
private record FabricRecipeSyncPayload(List<FabricRecipeEntry> entries) {
}
private record NeoForgeRecipeSyncPayload(
java.util.Set<net.minecraft.world.item.crafting.RecipeType<?>> recipeTypes,
java.util.List<RecipeHolder<?>> recipes
) {
}
}
+34
View File
@@ -0,0 +1,34 @@
import org.gradle.api.attributes.java.TargetJvmVersion
plugins {
id 'java-library'
id 'io.papermc.paperweight.userdev'
}
repositories {
mavenCentral()
maven {
name = 'papermc'
url = uri('https://repo.papermc.io/repository/maven-public/')
}
}
dependencies {
api project(':compat-api')
paperweight.paperDevBundle('26.2.build.87-stable')
}
java {
toolchain.languageVersion.set(JavaLanguageVersion.of(25))
}
configurations.configureEach {
attributes.attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 25)
}
paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.getMOJANG_PRODUCTION()
tasks.withType(JavaCompile).configureEach {
options.encoding = 'UTF-8'
options.release.set(21)
}
@@ -0,0 +1,270 @@
package cn.infstar.essentialsC.v26_2.jei;
import cn.infstar.essentialsC.compat.jei.JeiRecipeSyncAdapter;
import cn.infstar.essentialsC.compat.jei.RecipeGrouping;
import io.netty.buffer.Unpooled;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.network.RegistryFriendlyByteBuf;
import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket;
import net.minecraft.network.protocol.common.custom.DiscardedPayload;
import net.minecraft.resources.Identifier;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.item.crafting.RecipeHolder;
import net.minecraft.world.item.crafting.RecipeMap;
import net.minecraft.world.item.crafting.RecipeSerializer;
import org.bukkit.craftbukkit.entity.CraftPlayer;
import org.bukkit.entity.Player;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.logging.Logger;
public final class JeiRecipeSyncAdapterImpl implements JeiRecipeSyncAdapter {
private DiscardedPayload fabricPayloadCache;
private DiscardedPayload neoForgePayloadCache;
@Override
@SuppressWarnings({"unchecked", "deprecation"})
public void sendFabricRecipeSync(Player player, Logger logger, boolean debug) {
ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle();
MinecraftServer server = serverPlayer.level().getServer();
if (server == null) {
if (debug) {
logger.warning("服务端实例为 null");
}
return;
}
if (fabricPayloadCache != null) {
serverPlayer.connection.send(new ClientboundCustomPayloadPacket(fabricPayloadCache));
return;
}
RecipeMap recipeMap = server.getRecipeManager().recipes;
if (debug) {
logger.info("开始构建 Fabric 配方数据");
}
var list = new ArrayList<FabricRecipeEntry>();
var seen = new HashSet<RecipeSerializer<?>>();
var groupedRecipes = RecipeGrouping.groupBy(
recipeMap.values(), holder -> holder.value().getSerializer());
for (RecipeSerializer<?> serializer : BuiltInRegistries.RECIPE_SERIALIZER) {
if (!seen.add(serializer)) {
continue;
}
List<RecipeHolder<?>> recipes = groupedRecipes.get(serializer);
if (recipes != null && !recipes.isEmpty()) {
RecipeSerializer<?> entrySerializer = recipes.get(0).value().getSerializer();
list.add(new FabricRecipeEntry(entrySerializer, recipes));
}
}
var payload = new FabricRecipeSyncPayload(list);
if (debug) {
logger.info("Fabric 配方条目数: " + list.size());
}
RegistryFriendlyByteBuf buffer = new RegistryFriendlyByteBuf(Unpooled.buffer(), server.registryAccess());
byte[] bytes;
try {
getFabricCodec().encode(buffer, payload);
bytes = new byte[buffer.writerIndex()];
buffer.getBytes(0, bytes);
} finally {
buffer.release();
}
Identifier id = Identifier.fromNamespaceAndPath("fabric", "recipe_sync");
DiscardedPayload discardedPayload = new DiscardedPayload(id, bytes);
fabricPayloadCache = discardedPayload;
serverPlayer.connection.send(new ClientboundCustomPayloadPacket(discardedPayload));
if (debug) {
logger.info("已发送 Fabric 配方同步 [" + id + "], 大小: " + bytes.length + " bytes");
}
}
@Override
@SuppressWarnings({"unchecked", "deprecation"})
public void sendNeoForgeRecipeSync(Player player, Logger logger, boolean debug) {
ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle();
MinecraftServer server = serverPlayer.level().getServer();
if (server == null) {
if (debug) {
logger.warning("服务端实例为 null");
}
return;
}
if (neoForgePayloadCache != null) {
serverPlayer.connection.send(new ClientboundCustomPayloadPacket(neoForgePayloadCache));
sendTags(serverPlayer, server);
return;
}
RecipeMap recipeMap = server.getRecipeManager().recipes;
if (debug) {
logger.info("开始构建 NeoForge 配方数据");
}
java.util.List<net.minecraft.world.item.crafting.RecipeType<?>> allRecipeTypes =
BuiltInRegistries.RECIPE_TYPE.stream().toList();
if (debug) {
logger.info("NeoForge 配方类型数: " + allRecipeTypes.size());
}
var payload = createNeoForgePayload(allRecipeTypes, recipeMap);
RegistryFriendlyByteBuf buffer = new RegistryFriendlyByteBuf(Unpooled.buffer(), server.registryAccess());
byte[] bytes;
try {
getNeoForgeStreamCodec().encode(buffer, payload);
bytes = new byte[buffer.writerIndex()];
buffer.getBytes(0, bytes);
} finally {
buffer.release();
}
Identifier id = Identifier.fromNamespaceAndPath("neoforge", "recipe_content");
DiscardedPayload discardedPayload = new DiscardedPayload(id, bytes);
neoForgePayloadCache = discardedPayload;
serverPlayer.connection.send(new ClientboundCustomPayloadPacket(discardedPayload));
sendTags(serverPlayer, server);
if (debug) {
logger.info("已发送 NeoForge 配方同步 [" + id + "], 大小: " + bytes.length + " bytes");
}
}
@Override
public void clearCache() {
fabricPayloadCache = null;
neoForgePayloadCache = null;
}
private void sendTags(ServerPlayer serverPlayer, MinecraftServer server) {
serverPlayer.connection.send(new net.minecraft.network.protocol.common.ClientboundUpdateTagsPacket(
net.minecraft.tags.TagNetworkSerialization.serializeTagsToNetwork(server.registries())
));
}
@SuppressWarnings({"unchecked", "deprecation"})
private net.minecraft.network.codec.StreamCodec<RegistryFriendlyByteBuf, FabricRecipeSyncPayload> getFabricCodec() {
return FabricRecipeEntry.CODEC.apply(net.minecraft.network.codec.ByteBufCodecs.list())
.map(FabricRecipeSyncPayload::new, FabricRecipeSyncPayload::entries);
}
private NeoForgeRecipeSyncPayload createNeoForgePayload(
java.util.List<net.minecraft.world.item.crafting.RecipeType<?>> recipeTypes,
RecipeMap recipeMap
) {
var recipeTypeSet = new java.util.HashSet<>(recipeTypes);
if (recipeTypeSet.isEmpty()) {
return new NeoForgeRecipeSyncPayload(recipeTypeSet, java.util.List.of());
}
var recipeSubset = recipeMap.values().stream()
.filter(h -> recipeTypeSet.contains(h.value().getType()))
.toList();
return new NeoForgeRecipeSyncPayload(recipeTypeSet, recipeSubset);
}
@SuppressWarnings({"unchecked", "deprecation"})
private net.minecraft.network.codec.StreamCodec<RegistryFriendlyByteBuf, NeoForgeRecipeSyncPayload> getNeoForgeStreamCodec() {
return net.minecraft.network.codec.StreamCodec.composite(
net.minecraft.network.codec.ByteBufCodecs.registry(net.minecraft.core.registries.Registries.RECIPE_TYPE)
.apply(net.minecraft.network.codec.ByteBufCodecs.collection(java.util.HashSet::new)),
NeoForgeRecipeSyncPayload::recipeTypes,
RecipeHolder.STREAM_CODEC.apply(net.minecraft.network.codec.ByteBufCodecs.list()),
NeoForgeRecipeSyncPayload::recipes,
NeoForgeRecipeSyncPayload::new
);
}
@SuppressWarnings("deprecation")
private static class FabricRecipeEntry {
final Object serializer;
final List<RecipeHolder<?>> recipes;
FabricRecipeEntry(Object serializer, List<RecipeHolder<?>> recipes) {
this.serializer = serializer;
this.recipes = recipes;
}
static final net.minecraft.network.codec.StreamCodec<RegistryFriendlyByteBuf, FabricRecipeEntry> CODEC =
net.minecraft.network.codec.StreamCodec.ofMember(
FabricRecipeEntry::write,
FabricRecipeEntry::read
);
@SuppressWarnings("unchecked")
private static FabricRecipeEntry read(RegistryFriendlyByteBuf buf) {
Identifier recipeSerializerId = buf.readIdentifier();
RecipeSerializer<?> recipeSerializer = BuiltInRegistries.RECIPE_SERIALIZER.getValue(recipeSerializerId);
if (recipeSerializer == null) {
throw new RuntimeException("Tried syncing unsupported packet serializer '" + recipeSerializerId + "'!");
}
int count = buf.readVarInt();
var list = new ArrayList<RecipeHolder<?>>();
for (int i = 0; i < count; i++) {
net.minecraft.resources.ResourceKey<net.minecraft.world.item.crafting.Recipe<?>> id =
buf.readResourceKey(net.minecraft.core.registries.Registries.RECIPE);
try {
var streamCodecMethod = recipeSerializer.getClass().getMethod("streamCodec");
var streamCodec = streamCodecMethod.invoke(recipeSerializer);
net.minecraft.world.item.crafting.Recipe<?> recipe =
((net.minecraft.network.codec.StreamCodec<RegistryFriendlyByteBuf, net.minecraft.world.item.crafting.Recipe<?>>) streamCodec)
.decode(buf);
list.add(new RecipeHolder<>(id, recipe));
} catch (Exception e) {
throw new RuntimeException("Failed to decode recipe: " + e.getMessage(), e);
}
}
return new FabricRecipeEntry(recipeSerializer, list);
}
private void write(RegistryFriendlyByteBuf buf) {
try {
var getKeyMethod = BuiltInRegistries.RECIPE_SERIALIZER.getClass().getMethod("getKey", Object.class);
Identifier identifier = (Identifier) getKeyMethod.invoke(BuiltInRegistries.RECIPE_SERIALIZER, this.serializer);
buf.writeIdentifier(identifier);
} catch (Exception e) {
throw new RuntimeException("Failed to get serializer key: " + e.getMessage(), e);
}
buf.writeVarInt(this.recipes.size());
try {
var streamCodecMethod = this.serializer.getClass().getMethod("streamCodec");
@SuppressWarnings("unchecked")
var codec = (net.minecraft.network.codec.StreamCodec<RegistryFriendlyByteBuf, net.minecraft.world.item.crafting.Recipe<?>>)
streamCodecMethod.invoke(this.serializer);
for (RecipeHolder<?> recipe : this.recipes) {
buf.writeResourceKey(recipe.id());
codec.encode(buf, recipe.value());
}
} catch (Exception e) {
throw new RuntimeException("Failed to encode recipe: " + e.getMessage(), e);
}
}
}
private record FabricRecipeSyncPayload(List<FabricRecipeEntry> entries) {
}
private record NeoForgeRecipeSyncPayload(
java.util.Set<net.minecraft.world.item.crafting.RecipeType<?>> recipeTypes,
java.util.List<RecipeHolder<?>> recipes
) {
}
}