Compare commits
5
Commits
v1.2.5-dev
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
 Coldsmile
|
94197e6bfa | ||
|
Coldsmile
|
518c9c2f38 | ||
|
Coldsmile
|
45cb8de544 | ||
|
Coldsmile
|
c9bc102d9a | ||
|
Coldsmile
|
ba730cf45f |
+18
-3
@@ -1,19 +1,34 @@
|
||||
# 更新日志
|
||||
|
||||
## 1.3.0 - 2026-08-02
|
||||
## 1.3.1 - 2026-08-16
|
||||
|
||||
### 移除
|
||||
|
||||
- 移除内置维护模式、相关命令、权限、配置和 LuckPerms 软依赖；维护功能建议使用独立的 Maintenance 插件。
|
||||
|
||||
### 调整
|
||||
|
||||
- GitHub 仓库迁移至 InfstarMC 组织，并同步更新项目文档与下载地址。
|
||||
|
||||
### 升级说明
|
||||
|
||||
- 升级时不再读取 `maintenance.yml`；为避免删除管理员数据，服务器目录中的旧文件会原样保留，可在确认迁移完成后手动删除。
|
||||
|
||||
## 1.3.0 - 2026-08-05
|
||||
|
||||
### 新增
|
||||
|
||||
- 按 HuskHomes 的单服逻辑完整实现 TPA 请求、接受、拒绝、忽略、预热、冷却、位置快照、音效与相关权限。
|
||||
- 新增维护模式，包括 MOTD、BossBar、登录拦截、白名单、管理员通知和 LuckPerms 异步权限检查。
|
||||
- 新增 SkinBridge，可识别 InfstarMC、LittleSkin 与自定义 Blessing Skin Provider，并通过 MineSkin 与 Paper Profile API 同步皮肤。
|
||||
- 新增管理模式独立状态存储、玩家功能状态管理与 JEI 配方同步版本适配。
|
||||
- 新增管理模式独立状态存储与玩家功能状态管理。
|
||||
|
||||
### 优化
|
||||
|
||||
- 按便捷方块、管理、修复与皮肤功能重新整理运行时模块。
|
||||
- 完善潜影盒会话保护、TPA 请求队列、配置迁移、数据原子写入与持久化错误处理。
|
||||
- 适配 Paper `1.21.11`、`26.1.2` 与 `26.2`，最终插件保持 Java 21 字节码兼容。
|
||||
- 验证兼容 Paper `1.21.11` 与 `26.2`，最终插件保持 Java 21 字节码兼容。
|
||||
- 移除实验性的 JEI 配方同步及其版本适配子项目，插件继续通过 Paper 公共 API 兼容支持的服务端版本。
|
||||
- 迁移 Paper 弃用 API，并将弃用警告设为构建错误。
|
||||
- 统一 HuskHomes 风格的中英文消息、颜色和配置注释。
|
||||
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
轻量、现代、面向 Paper 服务端的基础功能插件，灵感来自 CMI，但更聚焦于常用能力与模块化构建。
|
||||
|
||||
[](https://github.com/Coldsmiles/EssentialsC/releases)
|
||||
[](LICENSE)
|
||||
[](https://github.com/InfstarMC/EssentialsC/releases)
|
||||
[](LICENSE)
|
||||
[](https://papermc.io/)
|
||||
[](https://adoptium.net/)
|
||||
|
||||
@@ -11,8 +11,8 @@
|
||||
|
||||
- 最低支持版本为 `Paper 1.21.11`
|
||||
- 已适配 `Paper 26.2`
|
||||
- 主插件使用 `Java 21`，Paper 26.x 版本适配模块使用对应服务端要求的 Java 工具链
|
||||
- 配置按职责拆分：主行为与 SkinBridge、模块开关、菜单布局、维护模式和语言文本分别管理
|
||||
- 插件统一使用 Paper 公共 API 和 Java 21 字节码，无需按服务端版本拆分构建
|
||||
- 配置按职责拆分：主行为与 SkinBridge、模块开关、菜单布局和语言文本分别管理
|
||||
- 支持运行期模块开关，避免为不同功能组合构建多个插件版本
|
||||
|
||||
## 主要功能
|
||||
@@ -43,12 +43,10 @@
|
||||
- `/seen` `(/info)`
|
||||
- `/tpsbar`
|
||||
- `/essc admin` 管理模式切换
|
||||
- `/maintenance` `(/maint)` 维护模式管理
|
||||
|
||||
### 控制台命令
|
||||
|
||||
- `/essc help`、`/essc version`、`/essc reload`
|
||||
- `/maintenance [on|off|status|reload|add|remove|list]`，也可通过 `/essc maintenance ...` 执行
|
||||
- `/seen [玩家]`、`/heal [玩家]`、`/feed [玩家]`、`/tpsbar [玩家]`
|
||||
- `/essc skin [status|refresh] [玩家]`
|
||||
|
||||
@@ -59,9 +57,7 @@
|
||||
- Shift + 右键快捷打开潜影盒
|
||||
- 潜影盒交互保护，尽量避免刷物品、吞物品和嵌套放入问题
|
||||
- 管理模式独立背包、装备栏与状态切换
|
||||
- 维护模式：替换 MOTD、登录拦截、白名单放行和管理员拦截通知
|
||||
- Enderman 掉落方块控制
|
||||
- JEI 配方同步修复
|
||||
|
||||
## 模块配置
|
||||
|
||||
@@ -72,21 +68,20 @@
|
||||
| `blocks` | 开启 | 便捷方块命令、`/essc blocks` 菜单、潜影盒快捷打开 |
|
||||
| `admin-mode` | 开启 | `/essc admin` 管理模式与独立状态保存 |
|
||||
| `tpsbar` | 开启 | 插件版 TPSBar，检测到服务端原生命令时自动避免冲突 |
|
||||
| `jei-sync` | 开启 | Fabric / NeoForge JEI 配方同步修复 |
|
||||
| `mob-drops` | 关闭 | 末影人掉落控制，默认关闭以保留过去标准版行为 |
|
||||
| `maintenance` | 开启 | 维护模式命令、MOTD 替换、登录拦截、白名单和拦截通知 |
|
||||
| `skin-bridge` | 关闭 | 查询外置 Yggdrasil profile，并通过 MineSkin 与 Paper Profile API 同步皮肤 |
|
||||
|
||||
修改模块开关后使用 `/essc reload` 即可刷新运行期服务、监听器和命令门禁。可选模块命令始终注册，模块关闭时会返回统一的停用提示，因此无需为了启用命令重启服务器。
|
||||
|
||||
## 安装说明
|
||||
|
||||
1. 从 [Releases](https://github.com/Coldsmiles/EssentialsC/releases) 下载所需版本。
|
||||
1. 从 [Releases](https://github.com/InfstarMC/EssentialsC/releases) 下载所需版本。
|
||||
2. 将插件放入服务端的 `plugins/` 目录。
|
||||
3. 建议安装 LuckPerms；维护模式会优先通过其缓存异步检查登录权限，未安装时会在玩家加入后立即复核。
|
||||
4. 启动一次服务端以生成配置文件。
|
||||
5. 按需修改 `plugins/EssentialsC/` 下的配置文件与 `lang/` 语言文件。
|
||||
6. 使用权限插件为玩家分配所需权限。
|
||||
3. 启动一次服务端以生成配置文件。
|
||||
4. 按需修改 `plugins/EssentialsC/` 下的配置文件与 `lang/` 语言文件。
|
||||
5. 使用权限插件为玩家分配所需权限。
|
||||
|
||||
维护功能建议独立安装 [Maintenance](https://github.com/kennytv/Maintenance)。EssentialsC 不再内置维护模式，也不要求安装该插件。
|
||||
|
||||
## 配置说明
|
||||
|
||||
@@ -97,7 +92,6 @@ SkinBridge 默认关闭。使用前需启用 `modules.yml` 中的 `modules.skin-
|
||||
- `config.yml`
|
||||
- 语言选择
|
||||
- 管理模式行为
|
||||
- JEI 同步开关
|
||||
- 掉落控制
|
||||
- TPSBar 模式
|
||||
- TPA 请求、预热、冷却和音效
|
||||
@@ -106,14 +100,6 @@ SkinBridge 默认关闭。使用前需启用 `modules.yml` 中的 `modules.skin-
|
||||
- 功能模块开关
|
||||
- `blocks-menu.yml`
|
||||
- 便捷菜单分区、槽位、材质和权限
|
||||
- `maintenance.yml`
|
||||
- 维护模式状态
|
||||
- 维护 MOTD
|
||||
- 维护踢出提示
|
||||
- 维护 BossBar
|
||||
- 绕过权限
|
||||
- 维护白名单
|
||||
- 拦截通知权限
|
||||
- `lang/zh_CN.yml`、`lang/en_US.yml`
|
||||
- 命令反馈
|
||||
- 帮助信息
|
||||
@@ -154,13 +140,10 @@ essentialsc.tpa.bypass-cooldown
|
||||
essentialsc.tpa.warmup.3
|
||||
essentialsc.command.admin
|
||||
essentialsc.command.tpsbar
|
||||
essentialsc.command.maintenance
|
||||
essentialsc.command.skin
|
||||
essentialsc.command.skin.status
|
||||
essentialsc.command.skin.refresh
|
||||
essentialsc.command.skin.others
|
||||
essentialsc.maintenance.bypass
|
||||
essentialsc.maintenance.notify
|
||||
essentialsc.shulkerbox.open
|
||||
essentialsc.mobdrops.enderman
|
||||
essentialsc.*
|
||||
@@ -171,7 +154,7 @@ essentialsc.*
|
||||
## 从源码构建
|
||||
|
||||
```bash
|
||||
git clone https://github.com/Coldsmiles/EssentialsC.git
|
||||
git clone https://github.com/InfstarMC/EssentialsC.git
|
||||
cd EssentialsC
|
||||
./gradlew build
|
||||
```
|
||||
@@ -190,8 +173,8 @@ Windows 可使用：
|
||||
./gradlew shadowJar
|
||||
./gradlew build
|
||||
./gradlew deployToPaper12111
|
||||
./gradlew deployToPaper2612
|
||||
./gradlew deployToPaper262
|
||||
./gradlew deployToLeaves262
|
||||
```
|
||||
|
||||
## 本地测试服
|
||||
@@ -201,16 +184,15 @@ Windows 可使用：
|
||||
| 测试服 | 端口 | 部署任务 | 启动脚本 |
|
||||
| --- | --- | --- | --- |
|
||||
| Paper 1.21.11 | `25566` | `deployToPaper12111` | `test-server/paper-1.21.11/start.bat` |
|
||||
| Paper 26.1.2 | `25565` | `deployToPaper2612` | `test-server/paper-26.1.2/start.bat` |
|
||||
| Paper 26.2 | 以本地配置为准 | `deployToPaper262` | `test-server/paper-26.2/start.bat` |
|
||||
| Paper 26.2 | `25567` | `deployToPaper262` | `test-server/paper-26.2/start.bat` |
|
||||
| Leaves 26.2 | `25568` | `deployToLeaves262` | `test-server/leaves-26.2/start.bat` |
|
||||
|
||||
IDEA 运行配置会在启动测试服前自动执行对应部署任务。部署任务会替换 `EssentialsC*.jar`，并删除 `plugins/EssentialsC` 数据目录，以便测试新增默认配置和语言文本。
|
||||
IDEA 运行配置会先构建插件，再由启动脚本复制最新 JAR，并保留插件数据以便测试升级流程。手动执行部署任务会替换 `EssentialsC*.jar` 并删除 `plugins/EssentialsC` 数据目录，用于测试全新安装及默认配置生成。
|
||||
|
||||
## 开发说明
|
||||
|
||||
- 使用 `paperweight-userdev` 进行 Paper 开发
|
||||
- 使用 Paper Lifecycle Command API 注册命令，避免直接反射 Bukkit CommandMap
|
||||
- 涉及 NMS 的功能通过 `compat-api` + `versions/v<版本>` 适配模块隔离，主插件只依赖稳定接口；当前包含 `1.21.11`、`26.1.2`、`26.2`
|
||||
- 运行时通过 `modules.yml` 控制模块加载，命令始终注册并按模块状态执行门禁
|
||||
- 普通 push/PR 会执行构建与测试，版本标签继续生成 GitHub Release
|
||||
|
||||
@@ -220,5 +202,5 @@ IDEA 运行配置会在启动测试服前自动执行对应部署任务。部署
|
||||
|
||||
## 仓库
|
||||
|
||||
- GitHub: <https://github.com/Coldsmiles/EssentialsC>
|
||||
- GitHub: <https://github.com/InfstarMC/EssentialsC>
|
||||
- Gitea: <https://git.infstar.cn/InfStarMC/EssentialsC>
|
||||
|
||||
+6
-17
@@ -10,7 +10,8 @@ plugins {
|
||||
}
|
||||
|
||||
group = 'cn.infstar'
|
||||
version = providers.gradleProperty('pluginVersion').orElse('1.3.0').get()
|
||||
def pluginVersion = providers.gradleProperty('pluginVersion').orElse('1.3.1').get()
|
||||
version = pluginVersion
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
@@ -22,8 +23,6 @@ repositories {
|
||||
|
||||
dependencies {
|
||||
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'
|
||||
testImplementation platform('org.junit:junit-bom:5.13.4')
|
||||
testImplementation 'org.junit.jupiter:junit-jupiter'
|
||||
@@ -52,9 +51,9 @@ tasks.withType(Test).configureEach {
|
||||
}
|
||||
|
||||
tasks.named('processResources', ProcessResources).configure {
|
||||
inputs.property('version', project.version)
|
||||
inputs.property('version', pluginVersion)
|
||||
filesMatching('paper-plugin.yml') {
|
||||
expand('version': project.version)
|
||||
expand('version': pluginVersion)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -65,19 +64,9 @@ tasks.named('jar').configure {
|
||||
tasks.named('shadowJar', ShadowJar).configure {
|
||||
group = 'build'
|
||||
description = '构建包含全部运行期可开关模块的 EssentialsC 插件。'
|
||||
archiveFileName.set("EssentialsC-${project.version}.jar")
|
||||
archiveFileName.set("EssentialsC-${pluginVersion}.jar")
|
||||
configurations = [project.configurations.runtimeClasspath]
|
||||
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 {
|
||||
@@ -137,5 +126,5 @@ def registerTestServerDeployTask = { String taskName, String serverPath, String
|
||||
}
|
||||
|
||||
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('deployToLeaves262', 'test-server/leaves-26.2', 'Leaves 26.2')
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
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'
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
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();
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
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,13 +4,36 @@ set -euo pipefail
|
||||
paper_version="${1:?必须提供 Paper 版本}"
|
||||
workspace="$(mktemp -d)"
|
||||
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() {
|
||||
if [[ -n "$server_pid" ]] && kill -0 "$server_pid" 2>/dev/null; then
|
||||
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
|
||||
fi
|
||||
rm -rf "$workspace"
|
||||
for _ in 1 2 3; do
|
||||
if rm -rf "$workspace"; then
|
||||
return
|
||||
fi
|
||||
sleep 1
|
||||
done
|
||||
echo "警告：无法完全清理临时测试目录 $workspace" >&2
|
||||
}
|
||||
trap cleanup EXIT
|
||||
|
||||
@@ -20,18 +43,18 @@ download_url="$(curl --fail --silent --show-error --location "$metadata_url" \
|
||||
|
||||
curl --fail --silent --show-error --location "$download_url" --output "$workspace/paper.jar"
|
||||
mkdir -p "$workspace/plugins"
|
||||
cp build/libs/EssentialsC-*.jar "$workspace/plugins/EssentialsC.jar"
|
||||
cp "$plugin_jar" "$workspace/plugins/EssentialsC.jar"
|
||||
printf 'eula=true\n' > "$workspace/eula.txt"
|
||||
printf 'online-mode=false\nserver-port=0\nenable-query=false\n' > "$workspace/server.properties"
|
||||
|
||||
(
|
||||
cd "$workspace"
|
||||
java -Xms512M -Xmx1G -jar paper.jar --nogui > server.log 2>&1
|
||||
exec java -Xms512M -Xmx1G -jar paper.jar --nogui > server.log 2>&1
|
||||
) &
|
||||
server_pid=$!
|
||||
|
||||
for _ in $(seq 1 120); do
|
||||
if grep -Fq 'EssentialsC v1.3.0 已启用' "$workspace/server.log"; then
|
||||
if grep -Fq "EssentialsC v${plugin_version} 已启用" "$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"
|
||||
exit 1
|
||||
|
||||
@@ -20,8 +20,3 @@ plugins {
|
||||
}
|
||||
|
||||
rootProject.name = 'EssentialsC'
|
||||
|
||||
include 'compat-api'
|
||||
include 'versions:v1_21_11'
|
||||
include 'versions:v26_1_2'
|
||||
include 'versions:v26_2'
|
||||
|
||||
@@ -7,13 +7,10 @@ import cn.infstar.essentialsC.commands.CommandRegistry;
|
||||
import cn.infstar.essentialsC.commands.HelpCommand;
|
||||
import cn.infstar.essentialsC.commands.PaperCommand;
|
||||
import cn.infstar.essentialsC.commands.VanishCommand;
|
||||
import cn.infstar.essentialsC.listeners.JeiRecipeSyncListener;
|
||||
import cn.infstar.essentialsC.listeners.MobDropListener;
|
||||
import cn.infstar.essentialsC.listeners.MobDropMenuListener;
|
||||
import cn.infstar.essentialsC.listeners.ShulkerBoxListener;
|
||||
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.skinbridge.SkinBridgeManager;
|
||||
import cn.infstar.essentialsC.teleport.TeleportRequestManager;
|
||||
@@ -23,7 +20,6 @@ import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.command.TabCompleter;
|
||||
import org.bukkit.event.HandlerList;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.plugin.messaging.Messenger;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
import io.papermc.paper.command.brigadier.BasicCommand;
|
||||
import io.papermc.paper.command.brigadier.CommandSourceStack;
|
||||
@@ -40,14 +36,11 @@ public final class EssentialsC extends JavaPlugin {
|
||||
private ModuleManager moduleManager;
|
||||
private FeatureConfigManager featureConfigManager;
|
||||
private AdminModeManager adminModeManager;
|
||||
private MaintenanceManager maintenanceManager;
|
||||
private TeleportRequestManager teleportRequestManager;
|
||||
private PlayerStateManager playerStateManager;
|
||||
private MaintenanceListener maintenanceListener;
|
||||
private TpsBarService tpsBarManager;
|
||||
private ShulkerBoxListener shulkerBoxListener;
|
||||
private BlocksMenuCommand blocksMenuCommandListener;
|
||||
private JeiRecipeSyncListener jeiRecipeSyncListener;
|
||||
private MobDropListener mobDropListener;
|
||||
private MobDropMenuListener mobDropMenuListener;
|
||||
private VanishListener vanishListener;
|
||||
@@ -75,9 +68,6 @@ public final class EssentialsC extends JavaPlugin {
|
||||
if (adminModeManager != null) {
|
||||
adminModeManager.shutdown();
|
||||
}
|
||||
if (maintenanceManager != null) {
|
||||
maintenanceManager.shutdown();
|
||||
}
|
||||
if (teleportRequestManager != null) {
|
||||
teleportRequestManager.shutdown();
|
||||
}
|
||||
@@ -95,7 +85,6 @@ public final class EssentialsC extends JavaPlugin {
|
||||
}
|
||||
VanishCommand.clearAll(this);
|
||||
unregisterRuntimeListeners();
|
||||
unregisterPluginChannels();
|
||||
getLogger().info("EssentialsC 已禁用。");
|
||||
}
|
||||
|
||||
@@ -115,10 +104,6 @@ public final class EssentialsC extends JavaPlugin {
|
||||
return featureConfigManager;
|
||||
}
|
||||
|
||||
public MaintenanceManager getMaintenanceManager() {
|
||||
return maintenanceManager;
|
||||
}
|
||||
|
||||
public TeleportRequestManager getTeleportRequestManager() {
|
||||
return teleportRequestManager;
|
||||
}
|
||||
@@ -139,10 +124,8 @@ public final class EssentialsC extends JavaPlugin {
|
||||
moduleStatus.clear();
|
||||
refreshCorePlayerFeatures();
|
||||
refreshAdminMode();
|
||||
refreshMaintenance();
|
||||
refreshTpsBar();
|
||||
refreshBlocks();
|
||||
refreshJeiSync();
|
||||
refreshMobDrops();
|
||||
refreshSkinBridge();
|
||||
}
|
||||
@@ -184,32 +167,6 @@ public final class EssentialsC extends JavaPlugin {
|
||||
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() {
|
||||
if (!moduleManager.isEnabled(ModuleManager.TPSBAR)) {
|
||||
if (tpsBarManager != null) {
|
||||
@@ -269,24 +226,6 @@ public final class EssentialsC extends JavaPlugin {
|
||||
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() {
|
||||
if (!moduleManager.isEnabled(ModuleManager.MOB_DROPS)) {
|
||||
if (mobDropListener != null) {
|
||||
@@ -334,24 +273,10 @@ public final class EssentialsC extends JavaPlugin {
|
||||
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() {
|
||||
unregisterListener(adminModeManager);
|
||||
unregisterListener(maintenanceListener);
|
||||
unregisterListener(shulkerBoxListener);
|
||||
unregisterListener(blocksMenuCommandListener);
|
||||
unregisterListener(jeiRecipeSyncListener);
|
||||
unregisterListener(mobDropListener);
|
||||
unregisterListener(mobDropMenuListener);
|
||||
unregisterListener(vanishListener);
|
||||
|
||||
@@ -44,6 +44,7 @@ public final class FeatureConfigManager {
|
||||
boolean mainChanged = mainConfig != loadedMainConfig;
|
||||
mainChanged |= migrateLegacyMainConfig(mainConfig);
|
||||
mainChanged |= migrateLegacyDebugSettings(mainConfig);
|
||||
mainChanged |= removeRetiredJeiSettings(mainConfig);
|
||||
if (mainConfig.getInt("config-version", 0) != MAIN_CONFIG_VERSION) {
|
||||
mainConfig.set("config-version", MAIN_CONFIG_VERSION);
|
||||
mainChanged = true;
|
||||
@@ -135,6 +136,16 @@ public final class FeatureConfigManager {
|
||||
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) {
|
||||
if (source == null) {
|
||||
return;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package cn.infstar.essentialsC;
|
||||
|
||||
import cn.infstar.essentialsC.util.AtomicYamlWriter;
|
||||
import org.bukkit.configuration.file.FileConfiguration;
|
||||
import org.bukkit.configuration.InvalidConfigurationException;
|
||||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
@@ -17,9 +18,7 @@ public final class ModuleManager {
|
||||
public static final String BLOCKS = "blocks";
|
||||
public static final String ADMIN_MODE = "admin-mode";
|
||||
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 MAINTENANCE = "maintenance";
|
||||
public static final String SKIN_BRIDGE = "skin-bridge";
|
||||
|
||||
private static final Map<String, Boolean> DEFAULT_MODULES = new LinkedHashMap<>();
|
||||
@@ -28,9 +27,7 @@ public final class ModuleManager {
|
||||
DEFAULT_MODULES.put(BLOCKS, true);
|
||||
DEFAULT_MODULES.put(ADMIN_MODE, true);
|
||||
DEFAULT_MODULES.put(TPSBAR, true);
|
||||
DEFAULT_MODULES.put(JEI_SYNC, true);
|
||||
DEFAULT_MODULES.put(MOB_DROPS, false);
|
||||
DEFAULT_MODULES.put(MAINTENANCE, true);
|
||||
DEFAULT_MODULES.put(SKIN_BRIDGE, false);
|
||||
}
|
||||
|
||||
@@ -58,11 +55,27 @@ public final class ModuleManager {
|
||||
throw new IllegalStateException("无法加载 modules.yml，请修复配置格式后重试。", exception);
|
||||
}
|
||||
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);
|
||||
for (Map.Entry<String, Boolean> module : DEFAULT_MODULES.entrySet()) {
|
||||
modulesConfig.addDefault(path(module.getKey()), module.getValue());
|
||||
}
|
||||
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) {
|
||||
|
||||
@@ -48,7 +48,6 @@ public final class CommandRegistry {
|
||||
registerCore("tpignore", "essentialsc.command.tpignore", TpIgnoreCommand::new);
|
||||
register("tpsbar", "essentialsc.command.tpsbar", ModuleManager.TPSBAR, TpsBarCommand::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("skin", "essentialsc.command.skin", ModuleManager.SKIN_BRIDGE, SkinBridgeCommand::new);
|
||||
}
|
||||
|
||||
@@ -104,10 +104,6 @@ public class HelpCommand extends BaseCommand implements TabCompleter {
|
||||
if (CommandRegistry.isAvailable("tpsbar") && sender.hasPermission("essentialsc.command.tpsbar")) {
|
||||
sendPrefixed(sender, lang.getString("help.commands.tpsbar"));
|
||||
}
|
||||
if (CommandRegistry.isAvailable("maintenance")
|
||||
&& sender.hasPermission("essentialsc.command.maintenance")) {
|
||||
sendPrefixed(sender, lang.getString("help.commands.maintenance"));
|
||||
}
|
||||
sender.sendMessage("");
|
||||
sendPrefixed(sender, lang.getString("help.footer"));
|
||||
}
|
||||
@@ -282,10 +278,6 @@ public class HelpCommand extends BaseCommand implements TabCompleter {
|
||||
otherCommands.append(lang.getString("help.commands.tpsbar")).append("\n");
|
||||
hasOtherCommands = true;
|
||||
}
|
||||
if (CommandRegistry.isAvailable("maintenance") && player.hasPermission("essentialsc.command.maintenance")) {
|
||||
otherCommands.append(lang.getString("help.commands.maintenance")).append("\n");
|
||||
hasOtherCommands = true;
|
||||
}
|
||||
|
||||
if (hasOtherCommands) {
|
||||
sendPrefixed(player, lang.getString("help.section-other"));
|
||||
@@ -367,8 +359,6 @@ public class HelpCommand extends BaseCommand implements TabCompleter {
|
||||
{"tpignore", "essentialsc.command.tpignore"},
|
||||
{"skin", "essentialsc.command.skin"},
|
||||
{"tpsbar", "essentialsc.command.tpsbar"},
|
||||
{"maintenance", "essentialsc.command.maintenance"},
|
||||
{"maint", "essentialsc.command.maintenance"},
|
||||
{"mobdrops", "essentialsc.mobdrops.enderman"},
|
||||
{"admin", "essentialsc.command.admin"},
|
||||
{"version", null},
|
||||
@@ -451,10 +441,6 @@ public class HelpCommand extends BaseCommand implements TabCompleter {
|
||||
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")
|
||||
@@ -499,14 +485,4 @@ public class HelpCommand extends BaseCommand implements TabCompleter {
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,179 +0,0 @@
|
||||
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;
|
||||
}
|
||||
}
|
||||
@@ -1,171 +0,0 @@
|
||||
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;
|
||||
}
|
||||
}
|
||||
-56
@@ -1,56 +0,0 @@
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,113 +0,0 @@
|
||||
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())
|
||||
|| maintenanceManager.isOperator(event.getUniqueId())) {
|
||||
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);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -1,461 +0,0 @@
|
||||
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 org.bukkit.scheduler.BukkitTask;
|
||||
|
||||
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 final BukkitTask operatorCacheTask;
|
||||
private FileConfiguration config;
|
||||
private BossBar bossBar;
|
||||
private volatile AccessSnapshot accessSnapshot = AccessSnapshot.disabled();
|
||||
private volatile Set<UUID> operatorUuids = Set.of();
|
||||
|
||||
public MaintenanceManager(EssentialsC plugin) {
|
||||
this.plugin = plugin;
|
||||
this.configFile = new File(plugin.getDataFolder(), "maintenance.yml");
|
||||
refreshOperatorCache();
|
||||
this.operatorCacheTask = plugin.getServer().getScheduler()
|
||||
.runTaskTimer(plugin, this::refreshOperatorCache, 20L, 20L);
|
||||
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.isOp() || player.hasPermission(getBypassPermission()) || isWhitelisted(player));
|
||||
}
|
||||
|
||||
public boolean isOperator(UUID uniqueId) {
|
||||
return uniqueId != null && operatorUuids.contains(uniqueId);
|
||||
}
|
||||
|
||||
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() {
|
||||
operatorCacheTask.cancel();
|
||||
accessSnapshot = AccessSnapshot.disabled();
|
||||
operatorUuids = Set.of();
|
||||
clearBossBar();
|
||||
}
|
||||
|
||||
private void refreshOperatorCache() {
|
||||
Set<UUID> operators = new LinkedHashSet<>();
|
||||
for (org.bukkit.OfflinePlayer operator : plugin.getServer().getOperators()) {
|
||||
operators.add(operator.getUniqueId());
|
||||
}
|
||||
operatorUuids = Set.copyOf(operators);
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
package cn.infstar.essentialsC.maintenance;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
public interface MaintenancePermissionResolver {
|
||||
|
||||
PermissionResult checkPermission(UUID uniqueId, String permission);
|
||||
|
||||
enum PermissionResult {
|
||||
GRANTED,
|
||||
DENIED,
|
||||
UNAVAILABLE
|
||||
}
|
||||
}
|
||||
-35
@@ -1,35 +0,0 @@
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
# EssentialsC 主配置
|
||||
# 其他配置：modules.yml、maintenance.yml、blocks-menu.yml
|
||||
# 其他配置：modules.yml、blocks-menu.yml
|
||||
# 消息与颜色：lang/<语言>.yml
|
||||
# 修改后使用 /essc reload 重载；命令注册状态发生变化时建议重启服务器。
|
||||
|
||||
@@ -17,16 +17,10 @@ admin-mode:
|
||||
actionbar:
|
||||
interval-ticks: 40
|
||||
|
||||
# JEI 配方同步修复；是否加载由 modules.yml 控制。
|
||||
jei-sync:
|
||||
# 玩家加入后延迟多少 tick 检测客户端品牌。
|
||||
brand-check-delay-ticks: 20
|
||||
send-player-message: true
|
||||
|
||||
# 生物掉落
|
||||
mob-drops:
|
||||
enderman:
|
||||
# 允许末影人掉落搬运的方块。
|
||||
# 控制该生物死亡时是否掉落物品（经验值正常掉落）；当前仅支持末影人。
|
||||
allow-drops: true
|
||||
|
||||
# TPA 传送请求
|
||||
|
||||
@@ -68,9 +68,6 @@ messages:
|
||||
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-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:
|
||||
title: '<#00FB9A><bold>EssentialsC</bold></#00FB9A> <gray>Command Help</gray>'
|
||||
version: '<gray>Plugin version: <white>{version}</white></gray>'
|
||||
@@ -110,7 +107,6 @@ help:
|
||||
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>'
|
||||
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:
|
||||
messages:
|
||||
@@ -262,25 +258,3 @@ mobdrops-menu:
|
||||
name: '<#00FB9A>Enderman Drops</#00FB9A>'
|
||||
status: '<gray>Current status: {status}</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>'
|
||||
|
||||
@@ -68,9 +68,6 @@ messages:
|
||||
shulkerbox-unstack-first: '<#FF3300>错误:</#FF3300> <#FF7E5E>请先将潜影盒拆分为单个后再快捷打开.</#FF7E5E>'
|
||||
shulkerbox-open-failed: '<#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:
|
||||
title: '<#00FB9A><bold>EssentialsC</bold></#00FB9A> <gray>命令帮助</gray>'
|
||||
version: '<gray>插件版本: <white>{version}</white></gray>'
|
||||
@@ -110,7 +107,6 @@ help:
|
||||
skin: '<white>/essc skin [status|refresh] [玩家]</white> <gray>- 查看或刷新皮肤桥接状态</gray>'
|
||||
admin: '<white>/essc admin</white> <gray>- 切换管理模式</gray>'
|
||||
tpsbar: '<white>/tpsbar [玩家]</white> <gray>- 切换 TPS 状态栏</gray>'
|
||||
maintenance: '<white>/maintenance [on|off|status|reload|add|remove|list]</white> <gray>- 管理维护模式</gray>'
|
||||
|
||||
tpa:
|
||||
messages:
|
||||
@@ -262,25 +258,3 @@ mobdrops-menu:
|
||||
name: '<#00FB9A>末影人掉落</#00FB9A>'
|
||||
status: '<gray>当前状态: {status}</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>'
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
# 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
|
||||
@@ -1,7 +1,7 @@
|
||||
# EssentialsC 模块配置
|
||||
#
|
||||
# modules.yml 用于控制功能模块是否在运行时加载。
|
||||
# 各功能的详细设置位于 config.yml、maintenance.yml 与 blocks-menu.yml。
|
||||
# 各功能的详细设置位于 config.yml 与 blocks-menu.yml。
|
||||
#
|
||||
# 修改模块开关后可使用 /essc reload 刷新运行期服务和监听器。
|
||||
# 直连命令的完整热增删仍建议通过重启服务器完成。
|
||||
@@ -18,15 +18,9 @@ modules:
|
||||
tpsbar:
|
||||
# 插件版 TPSBar。检测到服务端原生命令时会自动避免冲突。
|
||||
enabled: true
|
||||
jei-sync:
|
||||
# Fabric / NeoForge JEI 配方同步兼容修复。
|
||||
enabled: true
|
||||
mob-drops:
|
||||
# 末影人掉落控制菜单和监听器；具体掉落状态可在游戏内切换。
|
||||
enabled: false
|
||||
maintenance:
|
||||
# 维护模式。开启维护后可替换 MOTD，并阻止无绕过权限的玩家进入。
|
||||
enabled: true
|
||||
skin-bridge:
|
||||
# 查询外置 Yggdrasil profile，并通过 MineSkin 与 Paper Profile API 同步皮肤。
|
||||
enabled: false
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
name: EssentialsC
|
||||
description: 适用于 Paper 服务端的轻量基础功能插件。
|
||||
description: 高版本基础工具箱
|
||||
version: ${version}
|
||||
|
||||
main: cn.infstar.essentialsC.EssentialsC
|
||||
@@ -7,13 +7,6 @@ api-version: '1.21.11'
|
||||
load: POSTWORLD
|
||||
folia-supported: false
|
||||
|
||||
dependencies:
|
||||
server:
|
||||
LuckPerms:
|
||||
load: BEFORE
|
||||
required: false
|
||||
join-classpath: true
|
||||
|
||||
authors: [ Coldsmiles_7 ]
|
||||
website: www.infstar.cn
|
||||
|
||||
@@ -126,9 +119,6 @@ permissions:
|
||||
essentialsc.command.tpsbar.others:
|
||||
description: 允许为其他玩家切换 /tpsbar
|
||||
default: op
|
||||
essentialsc.command.maintenance:
|
||||
description: 允许管理维护模式
|
||||
default: op
|
||||
essentialsc.command.skin:
|
||||
description: 允许使用 SkinBridge 管理命令
|
||||
default: op
|
||||
@@ -145,17 +135,11 @@ permissions:
|
||||
essentialsc.command.skin.others:
|
||||
description: 允许查看或刷新其他玩家的皮肤
|
||||
default: op
|
||||
essentialsc.maintenance.bypass:
|
||||
description: 允许在维护模式下进入服务器
|
||||
default: op
|
||||
essentialsc.maintenance.notify:
|
||||
description: 允许接收维护模式拦截通知
|
||||
default: op
|
||||
essentialsc.shulkerbox.open:
|
||||
description: 允许通过 Shift+右键快捷打开潜影盒
|
||||
default: op
|
||||
essentialsc.mobdrops.enderman:
|
||||
description: 允许控制末影人掉落方块
|
||||
description: 允许控制末影人死亡时是否掉落物品
|
||||
default: op
|
||||
essentialsc.*:
|
||||
description: 授予 EssentialsC 的全部权限
|
||||
@@ -197,12 +181,9 @@ permissions:
|
||||
essentialsc.command.reload: true
|
||||
essentialsc.command.tpsbar: true
|
||||
essentialsc.command.tpsbar.others: true
|
||||
essentialsc.command.maintenance: true
|
||||
essentialsc.command.skin: true
|
||||
essentialsc.command.skin.status: true
|
||||
essentialsc.command.skin.refresh: true
|
||||
essentialsc.command.skin.others: true
|
||||
essentialsc.maintenance.bypass: true
|
||||
essentialsc.maintenance.notify: true
|
||||
essentialsc.shulkerbox.open: true
|
||||
essentialsc.mobdrops.enderman: true
|
||||
|
||||
@@ -12,7 +12,9 @@ import java.io.InputStreamReader;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
|
||||
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.assertNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
class ConfigurationResourcesTest {
|
||||
@@ -21,7 +23,6 @@ class ConfigurationResourcesTest {
|
||||
@ValueSource(strings = {
|
||||
"config.yml",
|
||||
"modules.yml",
|
||||
"maintenance.yml",
|
||||
"blocks-menu.yml",
|
||||
"paper-plugin.yml",
|
||||
"lang/zh_CN.yml",
|
||||
@@ -56,6 +57,30 @@ class ConfigurationResourcesTest {
|
||||
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>"));
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
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"));
|
||||
}
|
||||
}
|
||||
@@ -1,27 +0,0 @@
|
||||
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'
|
||||
}
|
||||
-269
@@ -1,269 +0,0 @@
|
||||
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
|
||||
) {
|
||||
}
|
||||
}
|
||||
@@ -1,34 +0,0 @@
|
||||
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)
|
||||
}
|
||||
-270
@@ -1,270 +0,0 @@
|
||||
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
|
||||
) {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
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)
|
||||
}
|
||||
-270
@@ -1,270 +0,0 @@
|
||||
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
|
||||
) {
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user