4 Commits
Author SHA1 Message Date
Coldsmile 2479192ad3 Release 1.6.0 with TPA replication 2026-06-25 23:40:30 +08:00
Coldsmile b57c7d4843 feat: release 1.5.0
Release / build (push) Has been cancelled
2026-06-12 00:08:40 +08:00
Coldsmile 113ae24afe feat: add maintenance mode 2026-06-11 00:19:54 +08:00
Coldsmile c0289c55d3 refactor: 改为运行期模块开关并简化构建 2026-06-10 00:39:42 +08:00
44 changed files with 3706 additions and 569 deletions
+2 -2
View File
@@ -26,8 +26,8 @@ jobs:
- name: 授予执行权限 - name: 授予执行权限
run: chmod +x gradlew run: chmod +x gradlew
- name: 构建全部版本 - name: 构建插件
run: ./gradlew buildAllVersions run: ./gradlew build
- name: 创建发行版 - name: 创建发行版
uses: softprops/action-gh-release@v1 uses: softprops/action-gh-release@v1
+50 -17
View File
@@ -10,10 +10,10 @@
## 项目定位 ## 项目定位
- 最低支持版本为 `Paper 1.21.11` - 最低支持版本为 `Paper 1.21.11`
- 已适配 `Paper 26.1.2` - 已适配 `Paper 26.2`
- 构建环境固定为 `Java 21` - 构建环境固定为 `Java 21`
- 配置与文本分离:行为配置放在 `config.yml`,提示文本放在 `lang/` - 配置、模块开关与文本分离:行为配置放在 `config.yml`模块开关放在 `modules.yml`提示文本放在 `lang/`
- 支持模块裁剪,便于按需构建不同版本 - 支持运行期模块开关,避免为不同功能组合构建多个插件版本
## 主要功能 ## 主要功能
@@ -43,26 +43,32 @@
- `/seen` `(/info)` - `/seen` `(/info)`
- `/tpsbar` - `/tpsbar`
- `/essc admin` 管理模式切换 - `/essc admin` 管理模式切换
- `/maintenance` `(/maint)` 维护模式管理
### 其它功能 ### 其它功能
- Shift + 右键快捷打开潜影盒 - Shift + 右键快捷打开潜影盒
- 潜影盒交互保护,尽量避免刷物品、吞物品和嵌套放入问题 - 潜影盒交互保护,尽量避免刷物品、吞物品和嵌套放入问题
- 管理模式独立背包、装备栏与状态切换 - 管理模式独立背包、装备栏与状态切换
- 维护模式:替换 MOTD、登录拦截、白名单放行和管理员拦截通知
- Enderman 掉落方块控制 - Enderman 掉落方块控制
- JEI 配方同步修复 - JEI 配方同步修复
## 构建变体 ## 模块配置
项目目前提供三个常用构建版本: 项目现在默认构建一个完整插件,功能是否启用由 `plugins/EssentialsC/modules.yml` 控制。
| 版本 | 产物名 | 说明 | | 模块 | 默认状态 | 说明 |
| --- | --- | --- | | --- | --- | --- |
| 标准版 | `EssentialsC-<version>.jar` | 默认版本,不包含 `mob-drops` 模块 | | `blocks` | 开启 | 便捷方块命令、`/essc blocks` 菜单、潜影盒快捷打开 |
| 完整版 | `EssentialsC-all-<version>.jar` | 包含全部模块 | | `player` | 开启 | 飞行、夜视、发光、治疗、喂食、修复、帽子、自杀、隐身、查询玩家 |
| 精简版 | `EssentialsC-lite-<version>.jar` | 仅排除 `blocks` 模块,保留 `mob-drops` | | `admin-mode` | 开启 | `/essc admin` 管理模式与独立状态保存 |
| `tpsbar` | 开启 | 插件版 TPSBar,仍受 `config.yml``tpsbar.mode` 控制 |
| `jei-sync` | 开启 | Fabric / NeoForge JEI 配方同步修复 |
| `mob-drops` | 关闭 | 末影人掉落控制,默认关闭以保留过去标准版行为 |
| `maintenance` | 开启 | 维护模式命令、MOTD 替换、登录拦截、白名单和拦截通知 |
如果需要进一步裁剪模块,也可以使用自定义构建参数生成 `custom` 版本 修改模块开关后可先使用 `/essc reload` 刷新运行期服务与监听器状态。由于 Bukkit 命令表不适合在运行期完整热增删,若模块是在启动时关闭的,对应直连命令可能仍需重启后才会注册;通过 `/essc <子命令>` 入口通常可立即按新的模块状态执行
## 安装说明 ## 安装说明
@@ -83,6 +89,16 @@
- 掉落控制 - 掉落控制
- TPSBar 模式 - TPSBar 模式
- 便捷菜单布局 - 便捷菜单布局
- `modules.yml`
- 功能模块开关
- `maintenance.yml`
- 维护模式状态
- 维护 MOTD
- 维护踢出提示
- 维护 BossBar
- 绕过权限
- 维护白名单
- 拦截通知权限
- `lang/zh_CN.yml``lang/en_US.yml` - `lang/zh_CN.yml``lang/en_US.yml`
- 命令反馈 - 命令反馈
- 帮助信息 - 帮助信息
@@ -110,6 +126,9 @@ essentialsc.command.vanish
essentialsc.command.seen essentialsc.command.seen
essentialsc.command.admin essentialsc.command.admin
essentialsc.command.tpsbar essentialsc.command.tpsbar
essentialsc.command.maintenance
essentialsc.maintenance.bypass
essentialsc.maintenance.notify
essentialsc.shulkerbox.open essentialsc.shulkerbox.open
essentialsc.mobdrops.enderman essentialsc.mobdrops.enderman
essentialsc.* essentialsc.*
@@ -122,29 +141,43 @@ essentialsc.*
```bash ```bash
git clone https://github.com/Coldsmiles/EssentialsC.git git clone https://github.com/Coldsmiles/EssentialsC.git
cd EssentialsC cd EssentialsC
./gradlew buildAllVersions ./gradlew build
``` ```
Windows 可使用: Windows 可使用:
```powershell ```powershell
.\gradlew.bat buildAllVersions .\gradlew.bat build
``` ```
构建产物输出到 `build/libs/` 构建产物输出到 `build/libs/EssentialsC-<version>.jar`
常用任务: 常用任务:
```bash ```bash
./gradlew shadowJarStandard ./gradlew shadowJar
./gradlew shadowJarAll ./gradlew build
./gradlew shadowJarLite ./gradlew deployToPaper12111
./gradlew deployToPaper2612
``` ```
## 本地测试服
项目包含两个本地测试服目录:
| 测试服 | 端口 | 部署任务 | 启动脚本 |
| --- | --- | --- | --- |
| 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` |
IDEA 运行配置会在启动测试服前自动执行对应部署任务。部署任务会替换 `EssentialsC*.jar`,并删除 `plugins/EssentialsC` 数据目录,以便测试新增默认配置和语言文本。
## 开发说明 ## 开发说明
- 使用 `paperweight-userdev` 进行 Paper 开发 - 使用 `paperweight-userdev` 进行 Paper 开发
- 运行时通过反射加载可选模块,避免裁剪版本因类缺失而启动失败 - 使用 Paper Lifecycle Command API 注册命令,避免直接反射 Bukkit CommandMap
- 涉及 NMS 的功能通过 `compat-api` + `versions/v<版本>` 适配模块隔离,主插件只依赖稳定接口;当前包含 `1.21.11``26.1.2``26.2`
- 运行时通过 `modules.yml` 控制模块加载,命令与监听器按模块状态注册
- 发布流程基于 GitHub Actions 和 Gradle Wrapper - 发布流程基于 GitHub Actions 和 Gradle Wrapper
## 许可证 ## 许可证
+30 -149
View File
@@ -1,8 +1,6 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
import org.gradle.language.jvm.tasks.ProcessResources import org.gradle.language.jvm.tasks.ProcessResources
import java.util.Collections
plugins { plugins {
id 'java' id 'java'
id 'io.papermc.paperweight.userdev' version '2.0.0-beta.21' id 'io.papermc.paperweight.userdev' version '2.0.0-beta.21'
@@ -10,7 +8,7 @@ plugins {
} }
group = 'cn.infstar' group = 'cn.infstar'
version = '1.3.1' version = '1.6.0'
repositories { repositories {
mavenCentral() mavenCentral()
@@ -22,101 +20,14 @@ repositories {
dependencies { dependencies {
paperweight.paperDevBundle('1.21.11-R0.1-SNAPSHOT') paperweight.paperDevBundle('1.21.11-R0.1-SNAPSHOT')
implementation project(':compat-api')
} }
java { java {
toolchain.languageVersion.set(JavaLanguageVersion.of(21)) toolchain.languageVersion.set(JavaLanguageVersion.of(21))
} }
def moduleExcludes = [ paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.getMOJANG_PRODUCTION()
'blocks': [
'**/commands/WorkbenchCommand.java',
'**/commands/AnvilCommand.java',
'**/commands/CartographyTableCommand.java',
'**/commands/GrindstoneCommand.java',
'**/commands/LoomCommand.java',
'**/commands/SmithingTableCommand.java',
'**/commands/StonecutterCommand.java',
'**/commands/EnderChestCommand.java',
'**/commands/BlocksMenuCommand.java',
'**/listeners/ShulkerBoxListener.java'
],
'player': [
'**/commands/FlyCommand.java',
'**/commands/NightVisionCommand.java',
'**/commands/GlowCommand.java',
'**/commands/HealCommand.java',
'**/commands/FeedCommand.java',
'**/commands/VanishCommand.java',
'**/commands/SeenCommand.java',
'**/commands/HatCommand.java',
'**/commands/SuicideCommand.java',
'**/commands/RepairCommand.java',
'**/commands/AdminCommand.java',
'**/commands/TpsBarCommand.java',
'**/tpsbar/TpsBarManager.java'
],
'jei-fix': [
'**/listeners/JeiRecipeSyncListener.java'
],
'mob-drops': [
'**/listeners/MobDropListener.java',
'**/listeners/MobDropMenuListener.java',
'**/commands/MobDropCommand.java'
]
]
def variantDefinitions = [
standard: [
archiveFileName: "EssentialsC-${project.version}.jar",
excludedModules: ['mob-drops']
],
all: [
archiveFileName: "EssentialsC-all-${project.version}.jar",
excludedModules: []
],
lite: [
archiveFileName: "EssentialsC-lite-${project.version}.jar",
excludedModules: ['blocks']
]
]
if (project.hasProperty('excludeModules')) {
def customExcludedModules = project.property('excludeModules')
.split(',')
.collect { it.trim() }
.findAll { !it.isEmpty() }
variantDefinitions.custom = [
archiveFileName: "EssentialsC-custom-${project.version}.jar",
excludedModules: customExcludedModules
]
}
def resolveExcludePatterns = { Collection<String> modules ->
modules.collectMany { module -> moduleExcludes.get(module, Collections.emptyList()) }.unique()
}
variantDefinitions.each { variantName, variantConfig ->
def unknownModules = variantConfig.excludedModules.findAll { !moduleExcludes.containsKey(it) }
if (!unknownModules.isEmpty()) {
throw new GradleException("Unknown modules for variant '${variantName}': ${unknownModules.join(', ')}")
}
}
def variantSourceSets = [:]
variantDefinitions.each { variantName, variantConfig ->
def sourceSet = sourceSets.create(variantName)
sourceSet.java.srcDirs = sourceSets.main.java.srcDirs
sourceSet.resources.srcDirs = sourceSets.main.resources.srcDirs
resolveExcludePatterns(variantConfig.excludedModules).each { pattern ->
sourceSet.java.exclude(pattern)
}
sourceSet.compileClasspath += sourceSets.main.compileClasspath
sourceSet.runtimeClasspath += sourceSet.output + sourceSet.compileClasspath
variantSourceSets[variantName] = sourceSet
}
tasks.withType(JavaCompile).configureEach { tasks.withType(JavaCompile).configureEach {
options.encoding = 'UTF-8' options.encoding = 'UTF-8'
@@ -126,87 +37,57 @@ tasks.withType(ProcessResources).configureEach {
filteringCharset = 'UTF-8' filteringCharset = 'UTF-8'
} }
variantDefinitions.keySet().each { variantName -> tasks.named('processResources', ProcessResources).configure {
def sourceSet = variantSourceSets[variantName]
def processTaskName = sourceSet.processResourcesTaskName
tasks.named(processTaskName, ProcessResources).configure {
inputs.property('version', project.version) inputs.property('version', project.version)
filesMatching('paper-plugin.yml') { filesMatching('paper-plugin.yml') {
expand('version': project.version) expand('version': project.version)
} }
} }
}
tasks.named('jar').configure { tasks.named('jar').configure {
enabled = false enabled = false
} }
tasks.named('shadowJar').configure { tasks.named('shadowJar', ShadowJar).configure {
enabled = false
}
def variantJarTasks = variantDefinitions.collect { variantName, variantConfig ->
def taskName = "shadowJar${variantName.capitalize()}"
def sourceSet = variantSourceSets[variantName]
tasks.register(taskName, ShadowJar) {
group = 'build' group = 'build'
description = "Builds the ${variantName} plugin jar." description = '构建包含全部运行期可开关模块的 EssentialsC 插件。'
archiveFileName.set(variantConfig.archiveFileName as String) archiveFileName.set("EssentialsC-${project.version}.jar")
from(sourceSet.output)
configurations = [project.configurations.runtimeClasspath] configurations = [project.configurations.runtimeClasspath]
dependsOn(tasks.named(sourceSet.classesTaskName))
[
project(':versions:v1_21_11'),
project(':versions:v26_1_2'),
project(':versions:v26_2')
].each { adapterProject ->
def adapterJar = adapterProject.tasks.named('jar')
dependsOn(adapterJar)
from(adapterJar.flatMap { it.archiveFile }.map { archiveFile -> zipTree(archiveFile) })
} }
} }
tasks.named('assemble').configure { tasks.named('assemble').configure {
dependsOn(variantJarTasks) dependsOn(tasks.named('shadowJar'))
} }
tasks.register('buildAllVersions') { def registerTestServerDeployTask = { String taskName, String serverPath, String serverName ->
group = 'build' tasks.register(taskName, Copy) {
description = 'Builds standard, all, and lite plugin jars.'
dependsOn(variantJarTasks)
}
tasks.register('deployToPaper12111', Copy) {
group = 'deployment' group = 'deployment'
description = 'Deploys the all variant to the local Paper 1.21.11 test server.' description = "构建并部署插件到本地 ${serverName} 测试服务器。"
def artifact = tasks.named('shadowJarAll').flatMap { it.archiveFile } def artifact = tasks.named('shadowJar').flatMap { it.archiveFile }
dependsOn(tasks.named('shadowJarAll')) def pluginsDir = layout.projectDirectory.dir("${serverPath}/plugins")
dependsOn(tasks.named('shadowJar'))
from(artifact) from(artifact)
into(layout.projectDirectory.dir('test-server/paper-1.21.11/plugins')) into(pluginsDir)
}
tasks.register('deployToPaper26') {
group = 'deployment'
description = 'Deploys the all variant to the local Paper 26.1.2 test server.'
dependsOn(tasks.named('shadowJarAll'))
doFirst { doFirst {
def pluginsDir = file("${projectDir}/test-server/paper-26.1.2/plugins") delete(fileTree(pluginsDir) {
if (!pluginsDir.exists()) {
return
}
fileTree(pluginsDir).matching {
include 'EssentialsC*.jar' include 'EssentialsC*.jar'
}.each { pluginJar -> })
pluginJar.delete() delete(pluginsDir.file('EssentialsC').asFile)
}
}
doLast {
def artifact = tasks.named('shadowJarAll').flatMap { it.archiveFile }
copy {
from(artifact)
into("${projectDir}/test-server/paper-26.1.2/plugins")
} }
} }
} }
tasks.register('buildAndDeployToPaper26') { registerTestServerDeployTask('deployToPaper12111', 'test-server/paper-1.21.11', 'Paper 1.21.11')
group = 'deployment' registerTestServerDeployTask('deployToPaper2612', 'test-server/paper-26.1.2', 'Paper 26.1.2')
description = 'Builds and deploys the all variant to the local Paper 26.1.2 test server.' registerTestServerDeployTask('deployToPaper262', 'test-server/paper-26.2', 'Paper 26.2')
dependsOn(tasks.named('clean'), tasks.named('deployToPaper26'))
}
+23
View File
@@ -0,0 +1,23 @@
plugins {
id 'java-library'
}
repositories {
mavenCentral()
maven {
name = 'papermc'
url = uri('https://repo.papermc.io/repository/maven-public/')
}
}
dependencies {
compileOnly 'io.papermc.paper:paper-api:1.21.11-R0.1-SNAPSHOT'
}
java {
toolchain.languageVersion.set(JavaLanguageVersion.of(21))
}
tasks.withType(JavaCompile).configureEach {
options.encoding = 'UTF-8'
}
@@ -0,0 +1,12 @@
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;
}
+9
View File
@@ -15,4 +15,13 @@ pluginManagement {
} }
} }
plugins {
id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
}
rootProject.name = 'EssentialsC' rootProject.name = 'EssentialsC'
include 'compat-api'
include 'versions:v1_21_11'
include 'versions:v26_1_2'
include 'versions:v26_2'
@@ -4,35 +4,59 @@ import cn.infstar.essentialsC.admin.AdminModeManager;
import cn.infstar.essentialsC.commands.BaseCommand; import cn.infstar.essentialsC.commands.BaseCommand;
import cn.infstar.essentialsC.commands.CommandRegistry; import cn.infstar.essentialsC.commands.CommandRegistry;
import cn.infstar.essentialsC.commands.HelpCommand; import cn.infstar.essentialsC.commands.HelpCommand;
import cn.infstar.essentialsC.commands.PaperCommand;
import cn.infstar.essentialsC.commands.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.teleport.TeleportRequestManager;
import cn.infstar.essentialsC.tpsbar.TpsBarManager;
import cn.infstar.essentialsC.tpsbar.TpsBarService; import cn.infstar.essentialsC.tpsbar.TpsBarService;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.command.TabCompleter;
import org.bukkit.event.HandlerList;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.plugin.messaging.Messenger;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import io.papermc.paper.command.brigadier.BasicCommand;
import io.papermc.paper.command.brigadier.CommandSourceStack;
import io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents;
import java.lang.reflect.Field; import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
public final class EssentialsC extends JavaPlugin { public final class EssentialsC extends JavaPlugin {
private static LangManager langManager; private static LangManager langManager;
private ModuleManager moduleManager;
private AdminModeManager adminModeManager; private AdminModeManager adminModeManager;
private MaintenanceManager maintenanceManager;
private TeleportRequestManager teleportRequestManager;
private MaintenanceListener maintenanceListener;
private TpsBarService tpsBarManager; private TpsBarService tpsBarManager;
private ShulkerBoxListener shulkerBoxListener;
private JeiRecipeSyncListener jeiRecipeSyncListener;
private MobDropListener mobDropListener;
private MobDropMenuListener mobDropMenuListener;
private VanishListener vanishListener;
private boolean commandsRegistered;
private final Map<String, String> moduleStatus = new LinkedHashMap<>();
@Override @Override
public void onEnable() { public void onEnable() {
langManager = new LangManager(this); langManager = new LangManager(this);
adminModeManager = new AdminModeManager(this); moduleManager = new ModuleManager(this);
getServer().getPluginManager().registerEvents(adminModeManager, this);
tpsBarManager = createOptionalService("cn.infstar.essentialsC.tpsbar.TpsBarManager", TpsBarService.class); reloadRuntimeModules();
if (tpsBarManager instanceof Listener listener) {
getServer().getPluginManager().registerEvents(listener, this);
}
registerPluginChannels();
registerListeners();
registerCommands(); registerCommands();
getLogger().info("EssentialsC enabled. Version: " + getDescription().getVersion()); logStartupSummary();
} }
@Override @Override
@@ -43,7 +67,16 @@ public final class EssentialsC extends JavaPlugin {
if (adminModeManager != null) { if (adminModeManager != null) {
adminModeManager.shutdown(); adminModeManager.shutdown();
} }
getLogger().info("EssentialsC disabled."); if (maintenanceManager != null) {
maintenanceManager.shutdown();
}
if (teleportRequestManager != null) {
teleportRequestManager.shutdown();
}
VanishCommand.clearAll(this);
unregisterRuntimeListeners();
unregisterPluginChannels();
getLogger().info("EssentialsC 已禁用。");
} }
public static LangManager getLangManager() { public static LangManager getLangManager() {
@@ -54,66 +87,258 @@ public final class EssentialsC extends JavaPlugin {
return adminModeManager; return adminModeManager;
} }
public ModuleManager getModuleManager() {
return moduleManager;
}
public MaintenanceManager getMaintenanceManager() {
return maintenanceManager;
}
public TeleportRequestManager getTeleportRequestManager() {
return teleportRequestManager;
}
public TpsBarService getTpsBarManager() { public TpsBarService getTpsBarManager() {
return tpsBarManager; return tpsBarManager;
} }
public void reloadRuntimeModules() {
moduleStatus.clear();
refreshPlayer();
refreshAdminMode();
refreshMaintenance();
refreshTpsBar();
refreshBlocks();
refreshJeiSync();
refreshMobDrops();
}
private void refreshPlayer() {
if (!moduleManager.isEnabled(ModuleManager.PLAYER)) {
if (teleportRequestManager != null) {
teleportRequestManager.shutdown();
HandlerList.unregisterAll(teleportRequestManager);
teleportRequestManager = null;
}
VanishCommand.clearAll(this);
if (vanishListener != null) {
HandlerList.unregisterAll(vanishListener);
vanishListener = null;
}
setModuleStatus("玩家功能", false, "已禁用");
return;
}
if (vanishListener == null) {
vanishListener = new VanishListener(this);
getServer().getPluginManager().registerEvents(vanishListener, this);
}
if (teleportRequestManager == null) {
teleportRequestManager = new TeleportRequestManager(this);
getServer().getPluginManager().registerEvents(teleportRequestManager, this);
} else {
teleportRequestManager.reload();
}
setModuleStatus("玩家功能", true, "命令可用");
}
private void refreshAdminMode() {
if (!moduleManager.isEnabled(ModuleManager.ADMIN_MODE)) {
if (adminModeManager != null) {
adminModeManager.shutdown();
HandlerList.unregisterAll(adminModeManager);
adminModeManager = null;
}
setModuleStatus("管理模式", false, "已禁用");
return;
}
if (adminModeManager == null) {
adminModeManager = new AdminModeManager(this);
getServer().getPluginManager().registerEvents(adminModeManager, this);
}
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);
getServer().getPluginManager().registerEvents(maintenanceListener, this);
}
setModuleStatus("维护模式", true, maintenanceManager.isEnabled() ? "当前开启" : "当前关闭");
}
private void refreshTpsBar() {
if (!moduleManager.isEnabled(ModuleManager.TPSBAR)) {
if (tpsBarManager != null) {
tpsBarManager.shutdown();
if (tpsBarManager instanceof Listener listener) {
HandlerList.unregisterAll(listener);
}
tpsBarManager = null;
}
setModuleStatus("TPSBar", false, "模块已禁用");
return;
}
if (tpsBarManager == null) {
tpsBarManager = new TpsBarManager(this);
if (tpsBarManager instanceof Listener listener) {
getServer().getPluginManager().registerEvents(listener, this);
}
} else {
tpsBarManager.reloadSettings();
}
if (tpsBarManager == null) {
setModuleStatus("TPSBar", false, "初始化失败");
} else if (!tpsBarManager.isPluginCommandEnabled()) {
setModuleStatus("TPSBar", false, tpsBarManager.isNativeCommandAvailable() ? "使用服务端原生命令" : "插件命令关闭");
} else {
setModuleStatus("TPSBar", true, "插件命令已启用");
}
}
private void refreshBlocks() {
if (!moduleManager.isEnabled(ModuleManager.BLOCKS)) {
if (shulkerBoxListener != null) {
HandlerList.unregisterAll(shulkerBoxListener);
shulkerBoxListener = null;
}
setModuleStatus("便捷方块", false, "已禁用");
return;
}
if (shulkerBoxListener == null) {
shulkerBoxListener = new ShulkerBoxListener(this);
getServer().getPluginManager().registerEvents(shulkerBoxListener, this);
}
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) {
HandlerList.unregisterAll(mobDropListener);
mobDropListener = null;
}
if (mobDropMenuListener != null) {
HandlerList.unregisterAll(mobDropMenuListener);
mobDropMenuListener = null;
}
setModuleStatus("生物掉落", false, "已禁用");
return;
}
if (mobDropListener == null) {
mobDropListener = new MobDropListener(this);
getServer().getPluginManager().registerEvents(mobDropListener, this);
} else {
mobDropListener.reload();
}
if (mobDropMenuListener == null) {
mobDropMenuListener = new MobDropMenuListener(this);
}
setModuleStatus("生物掉落", true, "末影人掉落控制已启用");
}
private void registerPluginChannels() { private void registerPluginChannels() {
org.bukkit.plugin.messaging.Messenger messenger = getServer().getMessenger(); Messenger messenger = getServer().getMessenger();
messenger.registerOutgoingPluginChannel(this, "fabric:recipe_sync"); messenger.registerOutgoingPluginChannel(this, "fabric:recipe_sync");
messenger.registerOutgoingPluginChannel(this, "neoforge:recipe_content"); messenger.registerOutgoingPluginChannel(this, "neoforge:recipe_content");
} }
private void registerListeners() { private void unregisterPluginChannels() {
if (registerListener("cn.infstar.essentialsC.listeners.ShulkerBoxListener")) { Messenger messenger = getServer().getMessenger();
getLogger().info("- Shulker box module"); messenger.unregisterOutgoingPluginChannel(this, "fabric:recipe_sync");
messenger.unregisterOutgoingPluginChannel(this, "neoforge:recipe_content");
} }
if (registerListener("cn.infstar.essentialsC.listeners.JeiRecipeSyncListener")) { private void unregisterRuntimeListeners() {
getLogger().info("- JEI recipe sync"); unregisterListener(adminModeManager);
} unregisterListener(maintenanceListener);
unregisterListener(shulkerBoxListener);
if (registerListener("cn.infstar.essentialsC.listeners.MobDropListener")) { unregisterListener(jeiRecipeSyncListener);
createOptionalInstance("cn.infstar.essentialsC.listeners.MobDropMenuListener"); unregisterListener(mobDropListener);
getLogger().info("- Mob drop control"); unregisterListener(mobDropMenuListener);
unregisterListener(vanishListener);
unregisterListener(teleportRequestManager);
if (tpsBarManager instanceof Listener listener) {
unregisterListener(listener);
} }
} }
private boolean registerListener(String className) { private void unregisterListener(Listener listener) {
try { if (listener != null) {
Class<?> listenerClass = Class.forName(className); HandlerList.unregisterAll(listener);
Object listenerInstance = listenerClass.getConstructor(EssentialsC.class).newInstance(this);
getServer().getPluginManager().registerEvents((org.bukkit.event.Listener) listenerInstance, this);
return true;
} catch (Exception ignored) {
return false;
} }
} }
private void createOptionalInstance(String className) { private void setModuleStatus(String moduleName, boolean enabled, String detail) {
try { moduleStatus.put(moduleName, (enabled ? "启用" : "关闭") + " - " + detail);
Class<?> targetClass = Class.forName(className);
targetClass.getConstructor(EssentialsC.class).newInstance(this);
} catch (Exception ignored) {
}
} }
private <T> T createOptionalService(String className, Class<T> serviceType) { private void logStartupSummary() {
try { long enabledCount = moduleStatus.values().stream()
Class<?> targetClass = Class.forName(className); .filter(status -> status.startsWith("启用"))
Object instance = targetClass.getConstructor(EssentialsC.class).newInstance(this); .count();
return serviceType.cast(instance); long disabledCount = moduleStatus.size() - enabledCount;
} catch (Exception ignored) {
return null; getLogger().info("EssentialsC v" + getDescription().getVersion()
+ " 已启用 | 模块: " + enabledCount + " 启用, " + disabledCount + " 关闭");
if (!getConfig().getBoolean("debug", false)) {
return;
}
getLogger().info("模块明细:");
for (Map.Entry<String, String> entry : moduleStatus.entrySet()) {
getLogger().info(" " + entry.getKey() + ": " + entry.getValue());
} }
} }
private void registerCommands() { private void registerCommands() {
try { if (commandsRegistered) {
Field bukkitCommandMap = Bukkit.getServer().getClass().getDeclaredField("commandMap"); return;
bukkitCommandMap.setAccessible(true); }
org.bukkit.command.CommandMap commandMap = (org.bukkit.command.CommandMap) bukkitCommandMap.get(Bukkit.getServer()); commandsRegistered = true;
getLifecycleManager().registerEventHandler(LifecycleEvents.COMMANDS, event -> {
for (CommandRegistry.CommandSpec spec : CommandRegistry.getCommandSpecs()) { for (CommandRegistry.CommandSpec spec : CommandRegistry.getCommandSpecs()) {
if (!spec.standalone()) { if (!spec.standalone()) {
continue; continue;
@@ -122,52 +347,51 @@ public final class EssentialsC extends JavaPlugin {
if (executor == null) { if (executor == null) {
continue; continue;
} }
registerCommandWithAliases(commandMap, spec.name(), executor, spec.aliases().toArray(String[]::new)); event.registrar().register(
spec.name(),
spec.name(),
spec.aliases(),
new EssentialsBasicCommand(spec.name(), executor)
);
} }
registerCommandWithAliases(commandMap, "essentialsc", new HelpCommand(), "essc"); event.registrar().register(
} catch (Exception e) { "essentialsc",
getLogger().severe("Failed to register commands: " + e.getMessage()); "essentialsc",
e.printStackTrace(); List.of("essc"),
} new EssentialsBasicCommand("essentialsc", new HelpCommand())
);
});
} }
private void registerCommandWithAliases(org.bukkit.command.CommandMap commandMap, String name, BaseCommand executor, String... aliases) { private static final class EssentialsBasicCommand implements BasicCommand {
Command command = new Command(name) {
@Override private final String name;
public boolean execute(CommandSender sender, String commandLabel, String[] args) { private final BaseCommand executor;
return executor.onCommand(sender, this, commandLabel, args); private final PaperCommand commandAdapter;
private EssentialsBasicCommand(String name, BaseCommand executor) {
this.name = name;
this.executor = executor;
this.commandAdapter = new PaperCommand(name, executor);
} }
@Override @Override
public java.util.List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException { public void execute(CommandSourceStack commandSourceStack, String[] args) {
if (executor instanceof org.bukkit.command.TabCompleter completer) { CommandSender sender = commandSourceStack.getSender();
return completer.onTabComplete(sender, this, alias, args); if (CommandRegistry.resolveCommandName(name) != null && !CommandRegistry.isAvailable(name)) {
sender.sendMessage(EssentialsC.getLangManager().getPrefixedString("messages.module-disabled"));
return;
} }
return super.tabComplete(sender, alias, args); executor.onCommand(sender, commandAdapter, name, args);
}
};
command.setPermission(executor.getPermission());
commandMap.register("", command);
for (String alias : aliases) {
Command aliasCmd = new Command(alias) {
@Override
public boolean execute(CommandSender sender, String commandLabel, String[] args) {
return executor.onCommand(sender, this, commandLabel, args);
} }
@Override @Override
public java.util.List<String> tabComplete(CommandSender sender, String label, String[] args) throws IllegalArgumentException { public Collection<String> suggest(CommandSourceStack commandSourceStack, String[] args) {
if (executor instanceof org.bukkit.command.TabCompleter completer) { if (executor instanceof TabCompleter completer) {
return completer.onTabComplete(sender, this, label, args); return completer.onTabComplete(commandSourceStack.getSender(), commandAdapter, name, args);
} }
return super.tabComplete(sender, label, args); return List.of();
}
};
aliasCmd.setPermission(executor.getPermission());
commandMap.register("", aliasCmd);
} }
} }
} }
@@ -38,7 +38,7 @@ public class LangManager {
public String getString(String path) { public String getString(String path) {
String value = langFile.getString(path); String value = langFile.getString(path);
if (value == null) { if (value == null) {
return translateColorCodes("&cMissing translation: " + path); return translateColorCodes("&c缺少语言文本: " + path);
} }
return translateColorCodes(value); return translateColorCodes(value);
} }
@@ -58,7 +58,7 @@ public class LangManager {
public List<String> getStringList(String path) { public List<String> getStringList(String path) {
List<String> values = langFile.getStringList(path); List<String> values = langFile.getStringList(path);
if (values.isEmpty()) { if (values.isEmpty()) {
values = List.of("&cMissing translation: " + path); values = List.of("&c缺少语言文本: " + path);
} }
List<String> translated = new ArrayList<>(); List<String> translated = new ArrayList<>();
@@ -87,12 +87,13 @@ public class LangManager {
config = YamlConfiguration.loadConfiguration(configFile); config = YamlConfiguration.loadConfiguration(configFile);
config.addDefault("config-version", CURRENT_CONFIG_VERSION); config.addDefault("config-version", CURRENT_CONFIG_VERSION);
config.addDefault("language", "zh_CN"); config.addDefault("language", "zh_CN");
config.addDefault("debug", false);
config.options().copyDefaults(true); config.options().copyDefaults(true);
try { try {
config.save(configFile); config.save(configFile);
} catch (Exception e) { } catch (Exception e) {
plugin.getLogger().severe("Failed to save config.yml: " + e.getMessage()); plugin.getLogger().severe("保存 config.yml 失败: " + e.getMessage());
} }
} }
@@ -103,22 +104,26 @@ public class LangManager {
return; return;
} }
String language = existingConfig.getString("language", "zh_CN");
File backupFile = new File(plugin.getDataFolder(), File backupFile = new File(plugin.getDataFolder(),
"config.v" + existingVersion + ".bak-" + System.currentTimeMillis() + ".yml"); "config.v" + existingVersion + ".bak-" + System.currentTimeMillis() + ".yml");
try { try {
Files.copy(configFile.toPath(), backupFile.toPath(), StandardCopyOption.REPLACE_EXISTING); Files.copy(configFile.toPath(), backupFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
plugin.saveResource("config.yml", true); InputStream defaultConfigStream = plugin.getResource("config.yml");
if (defaultConfigStream != null) {
YamlConfiguration defaultConfig = YamlConfiguration.loadConfiguration(
new InputStreamReader(defaultConfigStream, StandardCharsets.UTF_8)
);
existingConfig.setDefaults(defaultConfig);
existingConfig.options().copyDefaults(true);
}
existingConfig.set("config-version", CURRENT_CONFIG_VERSION);
existingConfig.save(configFile);
FileConfiguration newConfig = YamlConfiguration.loadConfiguration(configFile); plugin.getLogger().info("已将 config.yml 从版本 " + existingVersion
newConfig.set("language", language); + " 迁移到 " + CURRENT_CONFIG_VERSION + ",备份文件: " + backupFile.getName());
newConfig.save(configFile);
plugin.getLogger().info("Migrated config.yml from version " + existingVersion
+ " to " + CURRENT_CONFIG_VERSION + ". Backup saved to " + backupFile.getName());
} catch (IOException e) { } catch (IOException e) {
plugin.getLogger().severe("Failed to migrate config.yml: " + e.getMessage()); plugin.getLogger().severe("迁移 config.yml 失败: " + e.getMessage());
} }
} }
@@ -127,7 +132,7 @@ public class LangManager {
File langFolder = new File(plugin.getDataFolder(), "lang"); File langFolder = new File(plugin.getDataFolder(), "lang");
if (!langFolder.exists() && !langFolder.mkdirs()) { if (!langFolder.exists() && !langFolder.mkdirs()) {
plugin.getLogger().warning("Failed to create language folder: " + langFolder.getAbsolutePath()); plugin.getLogger().warning("创建语言文件夹失败: " + langFolder.getAbsolutePath());
} }
File langFileObj = new File(langFolder, currentLanguage + ".yml"); File langFileObj = new File(langFolder, currentLanguage + ".yml");
@@ -135,7 +140,7 @@ public class LangManager {
if (plugin.getResource("lang/" + currentLanguage + ".yml") != null) { if (plugin.getResource("lang/" + currentLanguage + ".yml") != null) {
plugin.saveResource("lang/" + currentLanguage + ".yml", false); plugin.saveResource("lang/" + currentLanguage + ".yml", false);
} else { } else {
plugin.getLogger().warning("Language file not found: " + currentLanguage + ".yml, falling back to en_US"); plugin.getLogger().warning("未找到语言文件: " + currentLanguage + ".yml,已回退到 en_US");
currentLanguage = "en_US"; currentLanguage = "en_US";
plugin.saveResource("lang/en_US.yml", false); plugin.saveResource("lang/en_US.yml", false);
langFileObj = new File(langFolder, "en_US.yml"); langFileObj = new File(langFolder, "en_US.yml");
@@ -0,0 +1,78 @@
package cn.infstar.essentialsC;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.plugin.java.JavaPlugin;
import java.io.File;
import java.io.IOException;
import java.util.LinkedHashMap;
import java.util.Map;
public final class ModuleManager {
private static final int CURRENT_CONFIG_VERSION = 1;
public static final String BLOCKS = "blocks";
public static final String PLAYER = "player";
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";
private static final Map<String, Boolean> DEFAULT_MODULES = new LinkedHashMap<>();
static {
DEFAULT_MODULES.put(BLOCKS, true);
DEFAULT_MODULES.put(PLAYER, 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);
}
private final JavaPlugin plugin;
private final File modulesFile;
private FileConfiguration modulesConfig;
public ModuleManager(JavaPlugin plugin) {
this.plugin = plugin;
this.modulesFile = new File(plugin.getDataFolder(), "modules.yml");
reload();
}
public void reload() {
if (!modulesFile.exists()) {
plugin.saveResource("modules.yml", false);
}
modulesConfig = YamlConfiguration.loadConfiguration(modulesFile);
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);
save();
}
public boolean isEnabled(String moduleKey) {
if (moduleKey == null || moduleKey.isBlank()) {
return true;
}
return modulesConfig.getBoolean(path(moduleKey), true);
}
private String path(String moduleKey) {
return "modules." + moduleKey + ".enabled";
}
private void save() {
try {
modulesConfig.save(modulesFile);
} catch (IOException e) {
plugin.getLogger().warning("保存 modules.yml 失败: " + e.getMessage());
}
}
}
@@ -328,7 +328,7 @@ public final class AdminModeManager implements Listener {
try { try {
data.save(dataFile); data.save(dataFile);
} catch (IOException e) { } catch (IOException e) {
plugin.getLogger().warning("Failed to save admin-mode.yml: " + e.getMessage()); plugin.getLogger().warning("保存 admin-mode.yml 失败: " + e.getMessage());
} }
} }
@@ -10,6 +10,10 @@ public class AdminCommand extends BaseCommand {
@Override @Override
protected boolean execute(Player player, String[] args) { protected boolean execute(Player player, String[] args) {
if (plugin.getAdminModeManager() == null) {
player.sendMessage(getLang().getPrefixedString("messages.module-disabled"));
return true;
}
plugin.getAdminModeManager().toggle(player); plugin.getAdminModeManager().toggle(player);
return true; return true;
} }
@@ -33,19 +33,17 @@ public abstract class BaseCommand implements CommandExecutor {
} }
protected void playBlockShortcutSound(Player player, Material material, Sound fallbackSound) { protected void playBlockShortcutSound(Player player, Material material, Sound fallbackSound) {
Sound sound = resolvePlaceSound(material); Sound sound = fallbackSound;
if (sound == null) { if (sound == null) {
sound = fallbackSound; sound = resolvePlaceSound(material);
} }
if (sound != null) { playShortcutSound(player, sound);
player.playSound(player.getLocation(), sound, 1.0F, 1.0F);
}
} }
protected void playShortcutSound(Player player, Sound sound) { protected void playShortcutSound(Player player, Sound sound) {
if (sound != null) { if (sound != null) {
player.playSound(player.getLocation(), sound, 1.0F, 1.0F); player.playSound(player.getLocation(), sound, 0.65F, 1.0F);
} }
} }
@@ -4,6 +4,7 @@ import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.NamespacedKey; import org.bukkit.NamespacedKey;
import org.bukkit.Sound;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
@@ -70,6 +71,7 @@ public class BlocksMenuCommand extends BaseCommand implements Listener {
return; return;
} }
player.openInventory(menu); player.openInventory(menu);
playShortcutSound(player, Sound.UI_BUTTON_CLICK);
return; return;
} }
@@ -85,6 +87,7 @@ public class BlocksMenuCommand extends BaseCommand implements Listener {
} }
player.openInventory(menu); player.openInventory(menu);
playShortcutSound(player, Sound.UI_BUTTON_CLICK);
} }
private int renderSections(Inventory menu, Player player, org.bukkit.configuration.ConfigurationSection sectionsConfig) { private int renderSections(Inventory menu, Player player, org.bukkit.configuration.ConfigurationSection sectionsConfig) {
@@ -1,6 +1,7 @@
package cn.infstar.essentialsC.commands; package cn.infstar.essentialsC.commands;
import cn.infstar.essentialsC.EssentialsC; import cn.infstar.essentialsC.EssentialsC;
import cn.infstar.essentialsC.ModuleManager;
import cn.infstar.essentialsC.tpsbar.TpsBarService; import cn.infstar.essentialsC.tpsbar.TpsBarService;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
@@ -20,44 +21,51 @@ public final class CommandRegistry {
private static final Set<String> UNAVAILABLE_COMMANDS = new java.util.HashSet<>(); private static final Set<String> UNAVAILABLE_COMMANDS = new java.util.HashSet<>();
static { static {
register("workbench", "essentialsc.command.workbench", "cn.infstar.essentialsC.commands.WorkbenchCommand", "wb"); register("workbench", "essentialsc.command.workbench", ModuleManager.BLOCKS, "cn.infstar.essentialsC.commands.WorkbenchCommand", "wb");
register("anvil", "essentialsc.command.anvil", "cn.infstar.essentialsC.commands.AnvilCommand"); register("anvil", "essentialsc.command.anvil", ModuleManager.BLOCKS, "cn.infstar.essentialsC.commands.AnvilCommand");
register("cartographytable", "essentialsc.command.cartographytable", "cn.infstar.essentialsC.commands.CartographyTableCommand", "ct", "cartography"); register("cartographytable", "essentialsc.command.cartographytable", ModuleManager.BLOCKS, "cn.infstar.essentialsC.commands.CartographyTableCommand", "ct", "cartography");
register("grindstone", "essentialsc.command.grindstone", "cn.infstar.essentialsC.commands.GrindstoneCommand", "gs"); register("grindstone", "essentialsc.command.grindstone", ModuleManager.BLOCKS, "cn.infstar.essentialsC.commands.GrindstoneCommand", "gs");
register("loom", "essentialsc.command.loom", "cn.infstar.essentialsC.commands.LoomCommand"); register("loom", "essentialsc.command.loom", ModuleManager.BLOCKS, "cn.infstar.essentialsC.commands.LoomCommand");
register("smithingtable", "essentialsc.command.smithingtable", "cn.infstar.essentialsC.commands.SmithingTableCommand", "st", "smithing"); register("smithingtable", "essentialsc.command.smithingtable", ModuleManager.BLOCKS, "cn.infstar.essentialsC.commands.SmithingTableCommand", "st", "smithing");
register("stonecutter", "essentialsc.command.stonecutter", "cn.infstar.essentialsC.commands.StonecutterCommand", "sc"); register("stonecutter", "essentialsc.command.stonecutter", ModuleManager.BLOCKS, "cn.infstar.essentialsC.commands.StonecutterCommand", "sc");
register("enderchest", "essentialsc.command.enderchest", "cn.infstar.essentialsC.commands.EnderChestCommand", "ec"); register("enderchest", "essentialsc.command.enderchest", ModuleManager.BLOCKS, "cn.infstar.essentialsC.commands.EnderChestCommand", "ec");
register("blocks", "essentialsc.command.blocks", "cn.infstar.essentialsC.commands.BlocksMenuCommand"); register("blocks", "essentialsc.command.blocks", ModuleManager.BLOCKS, "cn.infstar.essentialsC.commands.BlocksMenuCommand");
register("hat", "essentialsc.command.hat", "cn.infstar.essentialsC.commands.HatCommand"); register("hat", "essentialsc.command.hat", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.HatCommand");
register("suicide", "essentialsc.command.suicide", "cn.infstar.essentialsC.commands.SuicideCommand", "die"); register("suicide", "essentialsc.command.suicide", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.SuicideCommand", "die");
register("fly", "essentialsc.command.fly", "cn.infstar.essentialsC.commands.FlyCommand"); register("fly", "essentialsc.command.fly", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.FlyCommand");
register("nightvision", "essentialsc.command.nightvision", "cn.infstar.essentialsC.commands.NightVisionCommand", "nv"); register("nightvision", "essentialsc.command.nightvision", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.NightVisionCommand", "nv");
register("glow", "essentialsc.command.glow", "cn.infstar.essentialsC.commands.GlowCommand"); register("glow", "essentialsc.command.glow", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.GlowCommand");
register("heal", "essentialsc.command.heal", "cn.infstar.essentialsC.commands.HealCommand"); register("heal", "essentialsc.command.heal", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.HealCommand");
register("vanish", "essentialsc.command.vanish", "cn.infstar.essentialsC.commands.VanishCommand", "v"); register("vanish", "essentialsc.command.vanish", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.VanishCommand", "v");
register("seen", "essentialsc.command.seen", "cn.infstar.essentialsC.commands.SeenCommand", "info"); register("seen", "essentialsc.command.seen", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.SeenCommand", "info");
register("feed", "essentialsc.command.feed", "cn.infstar.essentialsC.commands.FeedCommand"); register("feed", "essentialsc.command.feed", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.FeedCommand");
register("repair", "essentialsc.command.repair", "cn.infstar.essentialsC.commands.RepairCommand", "rep"); register("repair", "essentialsc.command.repair", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.RepairCommand", "rep");
register("tpsbar", "essentialsc.command.tpsbar", "cn.infstar.essentialsC.commands.TpsBarCommand"); register("tpa", "essentialsc.command.tpa", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.TpaCommand");
register("mobdrops", "essentialsc.mobdrops.enderman", "cn.infstar.essentialsC.commands.MobDropCommand"); register("tpahere", "essentialsc.command.tpahere", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.TpaHereCommand");
registerSubCommand("admin", "essentialsc.command.admin", "cn.infstar.essentialsC.commands.AdminCommand"); register("tpaall", "essentialsc.command.tpaall", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.TpaAllCommand");
register("tpaccept", "essentialsc.command.tpaccept", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.TpAcceptCommand", "tpyes");
register("tpdeny", "essentialsc.command.tpdeny", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.TpDenyCommand", "tpdecline", "tpno");
register("tpignore", "essentialsc.command.tpignore", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.TpIgnoreCommand");
register("tpsbar", "essentialsc.command.tpsbar", ModuleManager.TPSBAR, "cn.infstar.essentialsC.commands.TpsBarCommand");
register("mobdrops", "essentialsc.mobdrops.enderman", ModuleManager.MOB_DROPS, "cn.infstar.essentialsC.commands.MobDropCommand");
register("maintenance", "essentialsc.command.maintenance", ModuleManager.MAINTENANCE, "cn.infstar.essentialsC.commands.MaintenanceCommand", "maint");
registerSubCommand("admin", "essentialsc.command.admin", ModuleManager.ADMIN_MODE, "cn.infstar.essentialsC.commands.AdminCommand");
} }
private CommandRegistry() { private CommandRegistry() {
} }
private static void register(String name, String permission, String className, String... aliases) { private static void register(String name, String permission, String moduleKey, String className, String... aliases) {
register(name, permission, className, true, aliases); register(name, permission, moduleKey, className, true, aliases);
} }
private static void registerSubCommand(String name, String permission, String className, String... aliases) { private static void registerSubCommand(String name, String permission, String moduleKey, String className, String... aliases) {
register(name, permission, className, false, aliases); register(name, permission, moduleKey, className, false, aliases);
} }
private static void register(String name, String permission, String className, boolean standalone, String... aliases) { private static void register(String name, String permission, String moduleKey, String className, boolean standalone, String... aliases) {
List<String> aliasList = List.of(aliases); List<String> aliasList = List.of(aliases);
CommandSpec spec = new CommandSpec(name, permission, className, aliasList, standalone); CommandSpec spec = new CommandSpec(name, permission, moduleKey, className, aliasList, standalone);
COMMANDS.put(name, spec); COMMANDS.put(name, spec);
ALIAS_TO_COMMAND.put(name, name); ALIAS_TO_COMMAND.put(name, name);
for (String alias : aliasList) { for (String alias : aliasList) {
@@ -91,6 +99,10 @@ public final class CommandRegistry {
return null; return null;
} }
if (isRuntimeDisabled(resolvedName)) {
return null;
}
BaseCommand cached = COMMAND_CACHE.get(resolvedName); BaseCommand cached = COMMAND_CACHE.get(resolvedName);
if (cached != null) { if (cached != null) {
return cached; return cached;
@@ -98,9 +110,6 @@ public final class CommandRegistry {
if (UNAVAILABLE_COMMANDS.contains(resolvedName)) { if (UNAVAILABLE_COMMANDS.contains(resolvedName)) {
return null; return null;
} }
if (isRuntimeDisabled(resolvedName)) {
return null;
}
CommandSpec spec = COMMANDS.get(resolvedName); CommandSpec spec = COMMANDS.get(resolvedName);
if (spec == null) { if (spec == null) {
@@ -125,6 +134,21 @@ public final class CommandRegistry {
} }
private static boolean isRuntimeDisabled(String resolvedName) { private static boolean isRuntimeDisabled(String resolvedName) {
CommandSpec spec = COMMANDS.get(resolvedName);
if (spec == null) {
return true;
}
try {
EssentialsC plugin = EssentialsC.getPlugin(EssentialsC.class);
ModuleManager moduleManager = plugin.getModuleManager();
if (moduleManager != null && !moduleManager.isEnabled(spec.moduleKey())) {
return true;
}
} catch (IllegalStateException ignored) {
return false;
}
if (!"tpsbar".equals(resolvedName)) { if (!"tpsbar".equals(resolvedName)) {
return false; return false;
} }
@@ -138,6 +162,11 @@ public final class CommandRegistry {
} }
} }
public record CommandSpec(String name, String permission, String className, List<String> aliases, boolean standalone) { public static void clearCache() {
COMMAND_CACHE.clear();
UNAVAILABLE_COMMANDS.clear();
}
public record CommandSpec(String name, String permission, String moduleKey, String className, List<String> aliases, boolean standalone) {
} }
} }
@@ -2,7 +2,7 @@ package cn.infstar.essentialsC.commands;
import cn.infstar.essentialsC.EssentialsC; import cn.infstar.essentialsC.EssentialsC;
import cn.infstar.essentialsC.LangManager; import cn.infstar.essentialsC.LangManager;
import cn.infstar.essentialsC.tpsbar.TpsBarService; import cn.infstar.essentialsC.teleport.TeleportRequestManager;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@@ -34,10 +34,9 @@ public class HelpCommand extends BaseCommand implements TabCompleter {
} }
plugin.reloadConfig(); plugin.reloadConfig();
EssentialsC.getLangManager().reload(); EssentialsC.getLangManager().reload();
TpsBarService tpsBarService = plugin.getTpsBarManager(); plugin.getModuleManager().reload();
if (tpsBarService != null) { CommandRegistry.clearCache();
tpsBarService.reloadSettings(); plugin.reloadRuntimeModules();
}
sender.sendMessage(getLang().getPrefixedString("messages.config-reloaded")); sender.sendMessage(getLang().getPrefixedString("messages.config-reloaded"));
return true; return true;
} }
@@ -56,10 +55,9 @@ public class HelpCommand extends BaseCommand implements TabCompleter {
} }
plugin.reloadConfig(); plugin.reloadConfig();
EssentialsC.getLangManager().reload(); EssentialsC.getLangManager().reload();
TpsBarService tpsBarService = plugin.getTpsBarManager(); plugin.getModuleManager().reload();
if (tpsBarService != null) { CommandRegistry.clearCache();
tpsBarService.reloadSettings(); plugin.reloadRuntimeModules();
}
sender.sendMessage(getLang().getPrefixedString("messages.config-reloaded")); sender.sendMessage(getLang().getPrefixedString("messages.config-reloaded"));
return true; return true;
} }
@@ -180,6 +178,30 @@ public class HelpCommand extends BaseCommand implements TabCompleter {
otherCommands.append(lang.getString("help.commands.seen")).append("\n"); otherCommands.append(lang.getString("help.commands.seen")).append("\n");
hasOtherCommands = true; hasOtherCommands = true;
} }
if (CommandRegistry.isAvailable("tpa") && player.hasPermission("essentialsc.command.tpa")) {
otherCommands.append(lang.getString("help.commands.tpa")).append("\n");
hasOtherCommands = true;
}
if (CommandRegistry.isAvailable("tpahere") && player.hasPermission("essentialsc.command.tpahere")) {
otherCommands.append(lang.getString("help.commands.tpahere")).append("\n");
hasOtherCommands = true;
}
if (CommandRegistry.isAvailable("tpaall") && player.hasPermission("essentialsc.command.tpaall")) {
otherCommands.append(lang.getString("help.commands.tpaall")).append("\n");
hasOtherCommands = true;
}
if (CommandRegistry.isAvailable("tpaccept") && player.hasPermission("essentialsc.command.tpaccept")) {
otherCommands.append(lang.getString("help.commands.tpaccept")).append("\n");
hasOtherCommands = true;
}
if (CommandRegistry.isAvailable("tpdeny") && player.hasPermission("essentialsc.command.tpdeny")) {
otherCommands.append(lang.getString("help.commands.tpdeny")).append("\n");
hasOtherCommands = true;
}
if (CommandRegistry.isAvailable("tpignore") && player.hasPermission("essentialsc.command.tpignore")) {
otherCommands.append(lang.getString("help.commands.tpignore")).append("\n");
hasOtherCommands = true;
}
if (CommandRegistry.isAvailable("admin") && player.hasPermission("essentialsc.command.admin")) { if (CommandRegistry.isAvailable("admin") && player.hasPermission("essentialsc.command.admin")) {
otherCommands.append(lang.getString("help.commands.admin")).append("\n"); otherCommands.append(lang.getString("help.commands.admin")).append("\n");
hasOtherCommands = true; hasOtherCommands = true;
@@ -188,6 +210,10 @@ public class HelpCommand extends BaseCommand implements TabCompleter {
otherCommands.append(lang.getString("help.commands.tpsbar")).append("\n"); otherCommands.append(lang.getString("help.commands.tpsbar")).append("\n");
hasOtherCommands = true; hasOtherCommands = true;
} }
if (CommandRegistry.isAvailable("maintenance") && player.hasPermission("essentialsc.command.maintenance")) {
otherCommands.append(lang.getString("help.commands.maintenance")).append("\n");
hasOtherCommands = true;
}
if (hasOtherCommands) { if (hasOtherCommands) {
sendPrefixed(player, lang.getString("help.section-other")); sendPrefixed(player, lang.getString("help.section-other"));
@@ -258,7 +284,18 @@ public class HelpCommand extends BaseCommand implements TabCompleter {
{"feed", "essentialsc.command.feed"}, {"feed", "essentialsc.command.feed"},
{"repair", "essentialsc.command.repair"}, {"repair", "essentialsc.command.repair"},
{"rep", "essentialsc.command.repair"}, {"rep", "essentialsc.command.repair"},
{"tpa", "essentialsc.command.tpa"},
{"tpahere", "essentialsc.command.tpahere"},
{"tpaall", "essentialsc.command.tpaall"},
{"tpaccept", "essentialsc.command.tpaccept"},
{"tpyes", "essentialsc.command.tpaccept"},
{"tpdeny", "essentialsc.command.tpdeny"},
{"tpdecline", "essentialsc.command.tpdeny"},
{"tpno", "essentialsc.command.tpdeny"},
{"tpignore", "essentialsc.command.tpignore"},
{"tpsbar", "essentialsc.command.tpsbar"}, {"tpsbar", "essentialsc.command.tpsbar"},
{"maintenance", "essentialsc.command.maintenance"},
{"maint", "essentialsc.command.maintenance"},
{"mobdrops", "essentialsc.mobdrops.enderman"}, {"mobdrops", "essentialsc.mobdrops.enderman"},
{"admin", "essentialsc.command.admin"}, {"admin", "essentialsc.command.admin"},
{"version", null}, {"version", null},
@@ -293,6 +330,21 @@ public class HelpCommand extends BaseCommand implements TabCompleter {
return players; return players;
} }
Player completionPlayer = sender instanceof Player senderPlayer ? senderPlayer : null;
if ((subCmd.equals("tpa") || subCmd.equals("tpahere"))
&& completionPlayer != null
&& sender.hasPermission("essentialsc.command." + subCmd)) {
return completeOnlinePlayers(completionPlayer, args[1], false);
}
if ((subCmd.equals("tpaccept") || subCmd.equals("tpyes") || subCmd.equals("tpdeny")
|| subCmd.equals("tpdecline") || subCmd.equals("tpno"))
&& completionPlayer != null
&& (sender.hasPermission("essentialsc.command.tpaccept") || sender.hasPermission("essentialsc.command.tpdeny"))) {
TeleportRequestManager manager = plugin.getTeleportRequestManager();
return manager == null ? List.of() : manager.getIncomingRequesterNames(completionPlayer, args[1]);
}
if ((subCmd.equals("nightvision") || subCmd.equals("nv")) && sender.hasPermission("essentialsc.command.nightvision")) { if ((subCmd.equals("nightvision") || subCmd.equals("nv")) && sender.hasPermission("essentialsc.command.nightvision")) {
return completeToggleArgs(args[1]); return completeToggleArgs(args[1]);
} }
@@ -311,6 +363,11 @@ public class HelpCommand extends BaseCommand implements TabCompleter {
} }
return players; return players;
} }
if ((subCmd.equals("maintenance") || subCmd.equals("maint"))
&& sender.hasPermission("essentialsc.command.maintenance")) {
return completeMaintenanceArgs(args[1]);
}
} }
return new ArrayList<>(); return new ArrayList<>();
@@ -326,4 +383,27 @@ public class HelpCommand extends BaseCommand implements TabCompleter {
} }
return completions; return completions;
} }
private List<String> completeOnlinePlayers(Player sender, String partialInput, boolean includeSelf) {
List<String> completions = new ArrayList<>();
String partial = partialInput.toLowerCase();
for (Player player : Bukkit.getOnlinePlayers()) {
if ((includeSelf || !player.getUniqueId().equals(sender.getUniqueId()))
&& player.getName().toLowerCase().startsWith(partial)) {
completions.add(player.getName());
}
}
return completions;
}
private List<String> completeMaintenanceArgs(String partialInput) {
List<String> completions = new ArrayList<>();
String partial = partialInput.toLowerCase();
for (String option : List.of("on", "off", "status", "reload", "add", "remove", "list")) {
if (option.startsWith(partial)) {
completions.add(option);
}
}
return completions;
}
} }
@@ -0,0 +1,163 @@
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" -> {
maintenanceManager.setEnabled(true);
sender.sendMessage(getLang().getPrefixedString("maintenance.messages.enabled"));
return true;
}
case "off", "disable", "disabled" -> {
maintenanceManager.setEnabled(false);
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];
if (maintenanceManager.addWhitelistEntry(target)) {
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];
if (maintenanceManager.removeWhitelistEntry(target)) {
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)
)));
}
@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;
}
}
@@ -30,26 +30,26 @@ public class SeenCommand extends BaseCommand {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
StringBuilder info = new StringBuilder(); StringBuilder info = new StringBuilder();
info.append(getLang().getPrefix()).append(ChatColor.GOLD).append("Player info: ") info.append(getLang().getPrefix()).append(ChatColor.GOLD).append("玩家信息: ")
.append(ChatColor.WHITE).append(target.getName()).append("\n"); .append(ChatColor.WHITE).append(target.getName()).append("\n");
if (target.isOnline()) { if (target.isOnline()) {
info.append(ChatColor.GRAY).append("Status: ").append(ChatColor.GREEN).append("Online").append("\n"); info.append(ChatColor.GRAY).append("状态: ").append(ChatColor.GREEN).append("在线").append("\n");
Player onlinePlayer = target.getPlayer(); Player onlinePlayer = target.getPlayer();
if (onlinePlayer != null) { if (onlinePlayer != null) {
info.append(ChatColor.GRAY).append("World: ").append(ChatColor.WHITE) info.append(ChatColor.GRAY).append("所在世界: ").append(ChatColor.WHITE)
.append(onlinePlayer.getWorld().getName()).append("\n"); .append(onlinePlayer.getWorld().getName()).append("\n");
} }
} else { } else {
info.append(ChatColor.GRAY).append("Status: ").append(ChatColor.RED).append("Offline").append("\n"); info.append(ChatColor.GRAY).append("状态: ").append(ChatColor.RED).append("离线").append("\n");
long lastSeen = target.getLastSeen(); long lastSeen = target.getLastSeen();
if (lastSeen > 0) { if (lastSeen > 0) {
info.append(ChatColor.GRAY).append("Last seen: ").append(ChatColor.WHITE) info.append(ChatColor.GRAY).append("最后在线: ").append(ChatColor.WHITE)
.append(format.format(new Date(lastSeen))).append("\n"); .append(format.format(new Date(lastSeen))).append("\n");
} }
} }
info.append(ChatColor.GRAY).append("First joined: ").append(ChatColor.WHITE) info.append(ChatColor.GRAY).append("首次加入: ").append(ChatColor.WHITE)
.append(format.format(new Date(target.getFirstPlayed()))); .append(format.format(new Date(target.getFirstPlayed())));
player.sendMessage(info.toString()); player.sendMessage(info.toString());
@@ -0,0 +1,87 @@
package cn.infstar.essentialsC.commands;
import cn.infstar.essentialsC.teleport.TeleportRequestManager;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.command.TabCompleter;
import org.bukkit.entity.Player;
import java.util.List;
import java.util.Map;
import java.util.Optional;
public final class TpAcceptCommand extends BaseCommand implements TabCompleter {
public TpAcceptCommand() {
super("essentialsc.command.tpaccept");
}
@Override
protected boolean execute(Player player, String[] args) {
if (args.length > 1) {
player.sendMessage(getLang().getPrefixedString("tpa.messages.usage-tpaccept"));
return true;
}
TeleportRequestManager manager = plugin.getTeleportRequestManager();
if (manager == null) {
player.sendMessage(getLang().getPrefixedString("messages.module-disabled"));
return true;
}
if (manager.isIgnoringRequests(player)) {
player.sendMessage(getLang().getPrefixedString("tpa.messages.ignoring-requests"));
return true;
}
Optional<TeleportRequestManager.TeleportRequest> request = manager.findIncoming(
player,
args.length == 0 ? null : args[0]
);
if (request.isEmpty()) {
player.sendMessage(getLang().getPrefixedString("tpa.messages.no-request"));
return true;
}
TeleportRequestManager.TeleportRequest accepted = request.get();
Map<String, String> placeholders = manager.placeholders(accepted);
TeleportRequestManager.TeleportResult result = manager.accept(player, accepted);
if (result.status() == TeleportRequestManager.TeleportResult.Status.EXPIRED) {
player.sendMessage(getLang().getPrefixedString("tpa.messages.expired", placeholders));
return true;
}
if (result.status() == TeleportRequestManager.TeleportResult.Status.PLAYER_OFFLINE) {
player.sendMessage(getLang().getPrefixedString("tpa.messages.player-offline", placeholders));
return true;
}
if (result.status() == TeleportRequestManager.TeleportResult.Status.ALREADY_WARMING_UP) {
player.sendMessage(getLang().getPrefixedString("tpa.messages.already-warming-up", placeholders));
return true;
}
if (result.status() == TeleportRequestManager.TeleportResult.Status.ON_COOLDOWN) {
player.sendMessage(getLang().getPrefixedString("tpa.messages.accept-cooldown",
Map.of("seconds", String.valueOf(result.cooldownSeconds()))));
return true;
}
player.sendMessage(getLang().getPrefixedString("tpa.messages.accepted-target", placeholders));
Player requester = Bukkit.getPlayer(accepted.requesterId());
if (requester != null && requester.isOnline()) {
requester.sendMessage(getLang().getPrefixedString("tpa.messages.accepted-sender", placeholders));
}
return true;
}
@Override
public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) {
if (args.length != 1 || !(sender instanceof Player player)) {
return List.of();
}
TeleportRequestManager manager = plugin.getTeleportRequestManager();
if (manager == null) {
return List.of();
}
return manager.getIncomingRequesterNames(player, args[0]);
}
}
@@ -0,0 +1,74 @@
package cn.infstar.essentialsC.commands;
import cn.infstar.essentialsC.teleport.TeleportRequestManager;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.command.TabCompleter;
import org.bukkit.entity.Player;
import java.util.List;
import java.util.Map;
import java.util.Optional;
public final class TpDenyCommand extends BaseCommand implements TabCompleter {
public TpDenyCommand() {
super("essentialsc.command.tpdeny");
}
@Override
protected boolean execute(Player player, String[] args) {
if (args.length > 1) {
player.sendMessage(getLang().getPrefixedString("tpa.messages.usage-tpdeny"));
return true;
}
TeleportRequestManager manager = plugin.getTeleportRequestManager();
if (manager == null) {
player.sendMessage(getLang().getPrefixedString("messages.module-disabled"));
return true;
}
if (manager.isIgnoringRequests(player)) {
player.sendMessage(getLang().getPrefixedString("tpa.messages.ignoring-requests"));
return true;
}
Optional<TeleportRequestManager.TeleportRequest> request = manager.findIncoming(
player,
args.length == 0 ? null : args[0]
);
if (request.isEmpty()) {
player.sendMessage(getLang().getPrefixedString("tpa.messages.no-request"));
return true;
}
TeleportRequestManager.TeleportRequest denied = request.get();
TeleportRequestManager.TeleportResult result = manager.deny(player, denied);
if (result.status() == TeleportRequestManager.TeleportResult.Status.EXPIRED) {
player.sendMessage(getLang().getPrefixedString("tpa.messages.expired", manager.placeholders(denied)));
return true;
}
Map<String, String> placeholders = manager.placeholders(denied);
player.sendMessage(getLang().getPrefixedString("tpa.messages.denied-target", placeholders));
Player requester = Bukkit.getPlayer(denied.requesterId());
if (requester != null && requester.isOnline()) {
requester.sendMessage(getLang().getPrefixedString("tpa.messages.denied-sender", placeholders));
}
return true;
}
@Override
public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) {
if (args.length != 1 || !(sender instanceof Player player)) {
return List.of();
}
TeleportRequestManager manager = plugin.getTeleportRequestManager();
if (manager == null) {
return List.of();
}
return manager.getIncomingRequesterNames(player, args[0]);
}
}
@@ -0,0 +1,26 @@
package cn.infstar.essentialsC.commands;
import cn.infstar.essentialsC.teleport.TeleportRequestManager;
import org.bukkit.entity.Player;
public final class TpIgnoreCommand extends BaseCommand {
public TpIgnoreCommand() {
super("essentialsc.command.tpignore");
}
@Override
protected boolean execute(Player player, String[] args) {
TeleportRequestManager manager = plugin.getTeleportRequestManager();
if (manager == null) {
player.sendMessage(getLang().getPrefixedString("messages.module-disabled"));
return true;
}
boolean ignoring = manager.toggleIgnoringRequests(player);
player.sendMessage(getLang().getPrefixedString(ignoring
? "tpa.messages.ignore-enabled"
: "tpa.messages.ignore-disabled"));
return true;
}
}
@@ -0,0 +1,45 @@
package cn.infstar.essentialsC.commands;
import cn.infstar.essentialsC.teleport.TeleportRequestManager;
import org.bukkit.entity.Player;
import java.util.Map;
public final class TpaAllCommand extends BaseCommand {
public TpaAllCommand() {
super("essentialsc.command.tpaall");
}
@Override
protected boolean execute(Player player, String[] args) {
if (args.length != 0) {
player.sendMessage(getLang().getPrefixedString("tpa.messages.usage-tpaall"));
return true;
}
TeleportRequestManager manager = plugin.getTeleportRequestManager();
if (manager == null) {
player.sendMessage(getLang().getPrefixedString("messages.module-disabled"));
return true;
}
if (manager.isIgnoringRequests(player)) {
player.sendMessage(getLang().getPrefixedString("tpa.messages.ignoring-requests"));
return true;
}
int sent = manager.sendTeleportAllRequest(player, target -> !VanishCommand.isVanished(target));
if (sent < 0) {
player.sendMessage(getLang().getPrefixedString("tpa.messages.send-cooldown",
Map.of("seconds", String.valueOf(manager.getSendCooldownSeconds(player)))));
return true;
}
if (sent <= 0) {
player.sendMessage(getLang().getPrefixedString("tpa.messages.tpaall-no-targets"));
return true;
}
player.sendMessage(getLang().getPrefixedString("tpa.messages.tpaall-sent"));
return true;
}
}
@@ -0,0 +1,123 @@
package cn.infstar.essentialsC.commands;
import cn.infstar.essentialsC.teleport.TeleportRequestManager;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.event.ClickEvent;
import net.kyori.adventure.text.event.HoverEvent;
import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import org.bukkit.Bukkit;
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.Map;
import java.util.Optional;
public class TpaCommand extends BaseCommand implements TabCompleter {
public TpaCommand() {
super("essentialsc.command.tpa");
}
@Override
protected boolean execute(Player player, String[] args) {
return sendRequest(player, args, TeleportRequestManager.TeleportRequest.Type.TPA);
}
protected boolean sendRequest(Player player, String[] args, TeleportRequestManager.TeleportRequest.Type type) {
if (args.length != 1) {
player.sendMessage(getLang().getPrefixedString(type == TeleportRequestManager.TeleportRequest.Type.TPA
? "tpa.messages.usage-tpa"
: "tpa.messages.usage-tpahere"));
return true;
}
TeleportRequestManager manager = plugin.getTeleportRequestManager();
if (manager == null) {
player.sendMessage(getLang().getPrefixedString("messages.module-disabled"));
return true;
}
if (manager.isIgnoringRequests(player)) {
player.sendMessage(getLang().getPrefixedString("tpa.messages.ignoring-requests"));
return true;
}
Player target = Bukkit.getPlayerExact(args[0]);
if (target == null || !target.isOnline() || VanishCommand.isVanished(target)) {
player.sendMessage(getLang().getPrefixedString("messages.player-not-found", Map.of("player", args[0])));
return true;
}
if (target.getUniqueId().equals(player.getUniqueId())) {
player.sendMessage(getLang().getPrefixedString("tpa.messages.self"));
return true;
}
TeleportRequestManager.CreateRequestResult createdRequest = manager.createRequest(player, target, type);
if (createdRequest.status() == TeleportRequestManager.CreateRequestStatus.DUPLICATE) {
player.sendMessage(getLang().getPrefixedString("tpa.messages.duplicate-request", Map.of("target", target.getName())));
return true;
}
if (createdRequest.status() == TeleportRequestManager.CreateRequestStatus.ON_COOLDOWN) {
player.sendMessage(getLang().getPrefixedString("tpa.messages.send-cooldown",
Map.of("seconds", String.valueOf(createdRequest.cooldownSeconds()))));
return true;
}
TeleportRequestManager.TeleportRequest request = createdRequest.request();
Map<String, String> placeholders = manager.placeholders(request);
player.sendMessage(getLang().getPrefixedString(type == TeleportRequestManager.TeleportRequest.Type.TPA
? "tpa.messages.sent-tpa"
: "tpa.messages.sent-tpahere", placeholders));
if (createdRequest.status() == TeleportRequestManager.CreateRequestStatus.IGNORED) {
return true;
}
target.sendMessage(getLang().getPrefixedString(type == TeleportRequestManager.TeleportRequest.Type.TPA
? "tpa.messages.received-tpa"
: "tpa.messages.received-tpahere", placeholders));
manager.playRequestReceivedSound(target);
sendResponseHint(target, request, placeholders);
return true;
}
private void sendResponseHint(Player target, TeleportRequestManager.TeleportRequest request, Map<String, String> placeholders) {
String requesterName = request.requesterName();
String acceptCommand = "/tpaccept " + requesterName;
String denyCommand = "/tpdeny " + requesterName;
Component hint = LegacyComponentSerializer.legacySection()
.deserialize(getLang().getPrefixedString("tpa.messages.response-hint", placeholders));
Component accept = LegacyComponentSerializer.legacySection()
.deserialize(getLang().getString("tpa.messages.accept-button"))
.clickEvent(ClickEvent.runCommand(acceptCommand))
.hoverEvent(HoverEvent.showText(Component.text(acceptCommand, NamedTextColor.GREEN)));
Component deny = LegacyComponentSerializer.legacySection()
.deserialize(getLang().getString("tpa.messages.deny-button"))
.clickEvent(ClickEvent.runCommand(denyCommand))
.hoverEvent(HoverEvent.showText(Component.text(denyCommand, NamedTextColor.RED)));
target.sendMessage(hint.append(Component.space()).append(accept).append(Component.space()).append(deny));
}
@Override
public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) {
if (args.length != 1 || !(sender instanceof Player player)) {
return List.of();
}
String partial = args[0].toLowerCase();
List<String> completions = new ArrayList<>();
for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
if (!onlinePlayer.getUniqueId().equals(player.getUniqueId())
&& !VanishCommand.isVanished(onlinePlayer)
&& onlinePlayer.getName().toLowerCase().startsWith(partial)) {
completions.add(onlinePlayer.getName());
}
}
return completions;
}
}
@@ -0,0 +1,17 @@
package cn.infstar.essentialsC.commands;
import cn.infstar.essentialsC.teleport.TeleportRequestManager;
import org.bukkit.entity.Player;
public final class TpaHereCommand extends TpaCommand {
public TpaHereCommand() {
super();
this.permission = "essentialsc.command.tpahere";
}
@Override
protected boolean execute(Player player, String[] args) {
return sendRequest(player, args, TeleportRequestManager.TeleportRequest.Type.TPAHERE);
}
}
@@ -22,7 +22,7 @@ public class TpsBarCommand extends BaseCommand implements TabCompleter {
protected boolean execute(Player player, String[] args) { protected boolean execute(Player player, String[] args) {
TpsBarService tpsBarService = plugin.getTpsBarManager(); TpsBarService tpsBarService = plugin.getTpsBarManager();
if (tpsBarService == null) { if (tpsBarService == null) {
player.sendMessage(getLang().getPrefixedString("messages.player-only")); player.sendMessage(getLang().getPrefixedString("messages.module-disabled"));
return true; return true;
} }
@@ -1,5 +1,6 @@
package cn.infstar.essentialsC.commands; package cn.infstar.essentialsC.commands;
import cn.infstar.essentialsC.EssentialsC;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.HashSet; import java.util.HashSet;
@@ -20,17 +21,38 @@ public class VanishCommand extends BaseCommand {
if (vanishedPlayers.contains(uuid)) { if (vanishedPlayers.contains(uuid)) {
vanishedPlayers.remove(uuid); vanishedPlayers.remove(uuid);
showPlayerToAll(player); showPlayerToAll(plugin, player);
player.sendMessage(getLang().getPrefixedString("messages.vanish-disabled")); player.sendMessage(getLang().getPrefixedString("messages.vanish-disabled"));
} else { } else {
vanishedPlayers.add(uuid); vanishedPlayers.add(uuid);
hidePlayerFromAll(player); hidePlayerFromAll(plugin, player);
player.sendMessage(getLang().getPrefixedString("messages.vanish-enabled")); player.sendMessage(getLang().getPrefixedString("messages.vanish-enabled"));
} }
return true; return true;
} }
private void hidePlayerFromAll(Player player) { public static void hideVanishedPlayersFrom(EssentialsC plugin, Player observer) {
for (Player vanished : plugin.getServer().getOnlinePlayers()) {
if (!observer.equals(vanished) && isVanished(vanished)) {
observer.hidePlayer(plugin, vanished);
}
}
}
public static void removeVanished(Player player) {
vanishedPlayers.remove(player.getUniqueId());
}
public static void clearAll(EssentialsC plugin) {
for (Player player : plugin.getServer().getOnlinePlayers()) {
if (isVanished(player)) {
showPlayerToAll(plugin, player);
}
}
vanishedPlayers.clear();
}
private static void hidePlayerFromAll(EssentialsC plugin, Player player) {
for (Player online : player.getServer().getOnlinePlayers()) { for (Player online : player.getServer().getOnlinePlayers()) {
if (online != player) { if (online != player) {
online.hidePlayer(plugin, player); online.hidePlayer(plugin, player);
@@ -38,7 +60,7 @@ public class VanishCommand extends BaseCommand {
} }
} }
private void showPlayerToAll(Player player) { private static void showPlayerToAll(EssentialsC plugin, Player player) {
for (Player online : player.getServer().getOnlinePlayers()) { for (Player online : player.getServer().getOnlinePlayers()) {
if (online != player) { if (online != player) {
online.showPlayer(plugin, player); online.showPlayer(plugin, player);
@@ -13,7 +13,7 @@ public class WorkbenchCommand extends BaseCommand {
@Override @Override
protected boolean execute(Player player, String[] args) { protected boolean execute(Player player, String[] args) {
player.openWorkbench(null, true); player.openWorkbench(null, true);
playBlockShortcutSound(player, Material.CRAFTING_TABLE, Sound.BLOCK_CRAFTER_CRAFT); playBlockShortcutSound(player, Material.CRAFTING_TABLE, Sound.UI_BUTTON_CLICK);
return true; return true;
} }
} }
@@ -1,27 +1,15 @@
package cn.infstar.essentialsC.listeners; package cn.infstar.essentialsC.listeners;
import cn.infstar.essentialsC.EssentialsC; import cn.infstar.essentialsC.EssentialsC;
import io.netty.buffer.Unpooled; import cn.infstar.essentialsC.compat.jei.JeiRecipeSyncAdapter;
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.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.craftbukkit.entity.CraftPlayer;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerJoinEvent;
import java.util.ArrayList; import java.util.Locale;
import java.util.HashSet; import java.util.logging.Level;
import java.util.List;
/** /**
* 为 Fabric / NeoForge 客户端补发配方同步数据,修复 1.21.2+ 的 JEI 配方显示问题。 * 为 Fabric / NeoForge 客户端补发配方同步数据,修复 1.21.2+ 的 JEI 配方显示问题。
@@ -32,14 +20,22 @@ public class JeiRecipeSyncListener implements Listener {
private final boolean enabled; private final boolean enabled;
private final boolean debug; private final boolean debug;
private final boolean sendPlayerMessage; private final boolean sendPlayerMessage;
private final int brandCheckDelayTicks;
private final JeiRecipeSyncAdapter adapter;
public JeiRecipeSyncListener(EssentialsC plugin) { public JeiRecipeSyncListener(EssentialsC plugin) {
this.plugin = plugin; this.plugin = plugin;
FileConfiguration config = plugin.getConfig(); FileConfiguration config = plugin.getConfig();
config.addDefault("jei-sync.brand-check-delay-ticks", 20);
config.options().copyDefaults(true);
plugin.saveConfig();
this.enabled = config.getBoolean("jei-sync.enabled", true); this.enabled = config.getBoolean("jei-sync.enabled", true);
this.debug = config.getBoolean("jei-sync.debug", false); this.debug = config.getBoolean("jei-sync.debug", config.getBoolean("debug", false));
this.sendPlayerMessage = config.getBoolean("jei-sync.send-player-message", true); 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 @EventHandler
@@ -47,16 +43,28 @@ public class JeiRecipeSyncListener implements Listener {
if (!enabled) { if (!enabled) {
return; return;
} }
if (adapter == null) {
if (debug) {
plugin.getLogger().warning("当前服务端版本没有可用的 JEI 配方同步适配器。");
}
return;
}
Player player = event.getPlayer(); Player player = event.getPlayer();
plugin.getServer().getScheduler().runTaskLater(plugin, () -> detectAndSync(player), brandCheckDelayTicks);
}
private void detectAndSync(Player player) {
if (!player.isOnline()) {
return;
}
String clientBrand = player.getClientBrandName(); String clientBrand = player.getClientBrandName();
if (debug) { if (debug) {
plugin.getLogger().info("========================================"); plugin.getLogger().info("JEI 客户端检测: player=" + player.getName()
plugin.getLogger().info("玩家 " + player.getName() + " 加入"); + ", brand=" + (clientBrand == null || clientBrand.isBlank() ? "unknown" : clientBrand)
plugin.getLogger().info("客户端品牌: '" + (clientBrand != null ? clientBrand : "null") + "'"); + ", delayTicks=" + brandCheckDelayTicks);
plugin.getLogger().info("JEI 同步功能: " + (enabled ? "启用" : "禁用"));
plugin.getLogger().info("========================================");
} }
if (clientBrand == null || clientBrand.isEmpty()) { if (clientBrand == null || clientBrand.isEmpty()) {
@@ -66,7 +74,7 @@ public class JeiRecipeSyncListener implements Listener {
return; return;
} }
String brandLower = clientBrand.toLowerCase(); String brandLower = clientBrand.toLowerCase(Locale.ROOT);
if (brandLower.contains("fabric")) { if (brandLower.contains("fabric")) {
if (debug) { if (debug) {
plugin.getLogger().info("检测到 Fabric 客户端,开始发送配方同步..."); plugin.getLogger().info("检测到 Fabric 客户端,开始发送配方同步...");
@@ -110,227 +118,47 @@ public class JeiRecipeSyncListener implements Listener {
player.sendMessage(component); player.sendMessage(component);
} }
@SuppressWarnings({"unchecked", "deprecation"})
private void sendFabricRecipeSync(Player player) { private void sendFabricRecipeSync(Player player) {
try { try {
ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle(); adapter.sendFabricRecipeSync(player, plugin.getLogger(), debug);
MinecraftServer server = serverPlayer.level().getServer();
if (server == null) {
if (debug) {
plugin.getLogger().warning("服务端实例为 null");
}
return;
}
RecipeMap recipeMap = server.getRecipeManager().recipes;
if (debug) {
plugin.getLogger().info("开始构建 Fabric 配方数据");
}
var list = new ArrayList<FabricRecipeEntry>();
var seen = new HashSet<RecipeSerializer<?>>();
for (RecipeSerializer<?> serializer : BuiltInRegistries.RECIPE_SERIALIZER) {
if (!seen.add(serializer)) {
continue;
}
List<RecipeHolder<?>> recipes = new ArrayList<>();
for (RecipeHolder<?> holder : recipeMap.values()) {
if (holder.value().getSerializer() == serializer) {
recipes.add(holder);
}
}
if (!recipes.isEmpty()) {
RecipeSerializer<?> entrySerializer = recipes.get(0).value().getSerializer();
list.add(new FabricRecipeEntry(entrySerializer, recipes));
}
}
var payload = new FabricRecipeSyncPayload(list);
if (debug) {
plugin.getLogger().info("Fabric 配方条目数: " + list.size());
}
RegistryFriendlyByteBuf buffer = new RegistryFriendlyByteBuf(Unpooled.buffer(), server.registryAccess());
getFabricCodec().encode(buffer, payload);
byte[] bytes = new byte[buffer.writerIndex()];
buffer.getBytes(0, bytes);
Identifier id = Identifier.fromNamespaceAndPath("fabric", "recipe_sync");
DiscardedPayload discardedPayload = new DiscardedPayload(id, bytes);
serverPlayer.connection.send(new ClientboundCustomPayloadPacket(discardedPayload));
if (debug) {
plugin.getLogger().info("已发送 Fabric 配方同步 [" + id + "], 大小: " + bytes.length + " bytes");
}
} catch (Exception e) { } catch (Exception e) {
plugin.getLogger().warning("发送 Fabric 配方同步失败: " + e.getMessage()); plugin.getLogger().warning("发送 Fabric 配方同步失败: " + e.getMessage());
e.printStackTrace(); if (debug) {
plugin.getLogger().log(Level.WARNING, "Fabric 配方同步异常详情", e);
}
} }
} }
@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);
}
@SuppressWarnings({"unchecked", "deprecation"})
private void sendNeoForgeRecipeSync(Player player) { private void sendNeoForgeRecipeSync(Player player) {
try { try {
ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle(); adapter.sendNeoForgeRecipeSync(player, plugin.getLogger(), debug);
MinecraftServer server = serverPlayer.level().getServer();
if (server == null) {
if (debug) {
plugin.getLogger().warning("服务端实例为 null");
}
return;
}
RecipeMap recipeMap = server.getRecipeManager().recipes;
if (debug) {
plugin.getLogger().info("开始构建 NeoForge 配方数据");
}
java.util.List<net.minecraft.world.item.crafting.RecipeType<?>> allRecipeTypes =
BuiltInRegistries.RECIPE_TYPE.stream().toList();
if (debug) {
plugin.getLogger().info("NeoForge 配方类型数: " + allRecipeTypes.size());
}
var payload = createNeoForgePayload(allRecipeTypes, recipeMap);
RegistryFriendlyByteBuf buffer = new RegistryFriendlyByteBuf(Unpooled.buffer(), server.registryAccess());
getNeoForgeStreamCodec().encode(buffer, payload);
byte[] bytes = new byte[buffer.writerIndex()];
buffer.getBytes(0, bytes);
Identifier id = Identifier.fromNamespaceAndPath("neoforge", "recipe_content");
DiscardedPayload discardedPayload = new DiscardedPayload(id, bytes);
serverPlayer.connection.send(new ClientboundCustomPayloadPacket(discardedPayload));
serverPlayer.connection.send(new net.minecraft.network.protocol.common.ClientboundUpdateTagsPacket(
net.minecraft.tags.TagNetworkSerialization.serializeTagsToNetwork(server.registries())
));
if (debug) {
plugin.getLogger().info("已发送 NeoForge 配方同步 [" + id + "], 大小: " + bytes.length + " bytes");
}
} catch (Exception e) { } catch (Exception e) {
plugin.getLogger().warning("发送 NeoForge 配方同步失败: " + e.getMessage()); plugin.getLogger().warning("发送 NeoForge 配方同步失败: " + e.getMessage());
e.printStackTrace(); if (debug) {
plugin.getLogger().log(Level.WARNING, "NeoForge 配方同步异常详情", e);
}
} }
} }
private NeoForgeRecipeSyncPayload createNeoForgePayload( private JeiRecipeSyncAdapter loadAdapter() {
java.util.List<net.minecraft.world.item.crafting.RecipeType<?>> recipeTypes, String versionKey = plugin.getServer().getBukkitVersion().split("-")[0]
RecipeMap recipeMap .replace('.', '_');
) { String className = "cn.infstar.essentialsC.v" + versionKey + ".jei.JeiRecipeSyncAdapterImpl";
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 {
// 这里保留 Object,是为了避免直接绑定易变的 NMS 泛型签名。
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 { try {
var streamCodecMethod = recipeSerializer.getClass().getMethod("streamCodec"); Class<?> adapterClass = Class.forName(className);
var streamCodec = streamCodecMethod.invoke(recipeSerializer); Object instance = adapterClass.getDeclaredConstructor().newInstance();
net.minecraft.world.item.crafting.Recipe<?> recipe = if (instance instanceof JeiRecipeSyncAdapter jeiRecipeSyncAdapter) {
((net.minecraft.network.codec.StreamCodec<RegistryFriendlyByteBuf, net.minecraft.world.item.crafting.Recipe<?>>) streamCodec) if (debug) {
.decode(buf); plugin.getLogger().info("已加载 JEI 配方同步适配器: " + className);
list.add(new RecipeHolder<>(id, recipe)); }
} catch (Exception e) { return jeiRecipeSyncAdapter;
throw new RuntimeException("Failed to decode recipe: " + e.getMessage(), e); }
plugin.getLogger().warning("JEI 配方同步适配器类型无效: " + className);
} catch (ReflectiveOperationException | LinkageError e) {
if (debug) {
plugin.getLogger().warning("加载 JEI 配方同步适配器失败: " + className + " (" + e.getMessage() + ")");
} }
} }
return null;
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
) {
} }
} }
@@ -274,12 +274,12 @@ public class ShulkerBoxListener implements Listener {
private void writeInventoryBack(ItemStack shulkerItem, ItemStack[] contents) { private void writeInventoryBack(ItemStack shulkerItem, ItemStack[] contents) {
if (!(shulkerItem.getItemMeta() instanceof BlockStateMeta blockStateMeta)) { if (!(shulkerItem.getItemMeta() instanceof BlockStateMeta blockStateMeta)) {
plugin.getLogger().warning("Failed to save shulker box contents: missing BlockStateMeta."); plugin.getLogger().warning("保存潜影盒内容失败: 缺少 BlockStateMeta");
return; return;
} }
if (!(blockStateMeta.getBlockState() instanceof ShulkerBox shulkerBox)) { if (!(blockStateMeta.getBlockState() instanceof ShulkerBox shulkerBox)) {
plugin.getLogger().warning("Failed to save shulker box contents: block state is not a ShulkerBox."); plugin.getLogger().warning("保存潜影盒内容失败: 方块状态不是 ShulkerBox");
return; return;
} }
@@ -0,0 +1,29 @@
package cn.infstar.essentialsC.listeners;
import cn.infstar.essentialsC.EssentialsC;
import cn.infstar.essentialsC.commands.VanishCommand;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent;
public final class VanishListener implements Listener {
private final EssentialsC plugin;
public VanishListener(EssentialsC plugin) {
this.plugin = plugin;
}
@EventHandler
public void onPlayerJoin(PlayerJoinEvent event) {
VanishCommand.hideVanishedPlayersFrom(plugin, event.getPlayer());
}
@EventHandler
public void onPlayerQuit(PlayerQuitEvent event) {
Player player = event.getPlayer();
VanishCommand.removeVanished(player);
}
}
@@ -0,0 +1,96 @@
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.Listener;
import org.bukkit.event.player.PlayerLoginEvent;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.event.server.ServerListPingEvent;
import java.net.InetAddress;
import java.util.Map;
public final class MaintenanceListener implements Listener {
private final EssentialsC plugin;
public MaintenanceListener(EssentialsC plugin) {
this.plugin = plugin;
}
@EventHandler
public void onServerListPing(ServerListPingEvent event) {
MaintenanceManager maintenanceManager = plugin.getMaintenanceManager();
if (!plugin.getModuleManager().isEnabled(ModuleManager.MAINTENANCE)
|| maintenanceManager == null
|| !maintenanceManager.isEnabled()
|| !maintenanceManager.isMotdEnabled()) {
return;
}
event.setMotd(maintenanceManager.getMotd());
}
@EventHandler
public void onPlayerLogin(PlayerLoginEvent event) {
MaintenanceManager maintenanceManager = plugin.getMaintenanceManager();
if (!plugin.getModuleManager().isEnabled(ModuleManager.MAINTENANCE)
|| maintenanceManager == null
|| !maintenanceManager.isEnabled()) {
return;
}
if (maintenanceManager.canJoin(event.getPlayer())) {
return;
}
event.disallow(PlayerLoginEvent.Result.KICK_OTHER, maintenanceManager.getKickMessage());
notifyBlockedLogin(event, maintenanceManager);
}
@EventHandler
public void onPlayerJoin(PlayerJoinEvent event) {
MaintenanceManager maintenanceManager = plugin.getMaintenanceManager();
if (!plugin.getModuleManager().isEnabled(ModuleManager.MAINTENANCE) || maintenanceManager == null) {
return;
}
maintenanceManager.addBossBarPlayer(event.getPlayer());
}
@EventHandler
public void onPlayerQuit(PlayerQuitEvent event) {
MaintenanceManager maintenanceManager = plugin.getMaintenanceManager();
if (maintenanceManager != null) {
maintenanceManager.removeBossBarPlayer(event.getPlayer());
}
}
private void notifyBlockedLogin(PlayerLoginEvent event, MaintenanceManager maintenanceManager) {
if (!maintenanceManager.isNotifyEnabled()) {
return;
}
String address = "";
InetAddress inetAddress = event.getAddress();
if (inetAddress != null) {
address = inetAddress.getHostAddress();
}
String message = EssentialsC.getLangManager().getPrefixedString("maintenance.messages.login-blocked",
Map.of(
"player", event.getPlayer().getName(),
"uuid", event.getPlayer().getUniqueId().toString(),
"address", address
));
for (Player player : plugin.getServer().getOnlinePlayers()) {
if (player.hasPermission(maintenanceManager.getNotifyPermission())) {
player.sendMessage(message);
}
}
}
}
@@ -0,0 +1,321 @@
package cn.infstar.essentialsC.maintenance;
import cn.infstar.essentialsC.EssentialsC;
import org.bukkit.ChatColor;
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.file.YamlConfiguration;
import org.bukkit.entity.Player;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Locale;
import java.util.Set;
import java.util.UUID;
public final class MaintenanceManager {
private static final int CURRENT_CONFIG_VERSION = 1;
private final EssentialsC plugin;
private final File configFile;
private FileConfiguration config;
private BossBar bossBar;
public MaintenanceManager(EssentialsC plugin) {
this.plugin = plugin;
this.configFile = new File(plugin.getDataFolder(), "maintenance.yml");
reload();
}
public void reload() {
if (!configFile.exists()) {
plugin.saveResource("maintenance.yml", false);
}
config = YamlConfiguration.loadConfiguration(configFile);
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("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);
save();
refreshBossBar();
}
public boolean isEnabled() {
return config.getBoolean("enabled", false);
}
public void setEnabled(boolean enabled) {
config.set("enabled", enabled);
save();
refreshBossBar();
}
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 canJoin(Player player) {
return player != null && (player.hasPermission(getBypassPermission()) || isWhitelisted(player));
}
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 boolean addWhitelistEntry(String input) {
String normalized = normalizeEntry(input);
if (normalized.isEmpty()) {
return false;
}
UUID uuid = parseUuid(normalized);
if (uuid != null) {
return addWhitelistUuid(uuid.toString());
}
return addWhitelistName(input);
}
public boolean removeWhitelistEntry(String input) {
String normalized = normalizeEntry(input);
if (normalized.isEmpty()) {
return false;
}
UUID uuid = parseUuid(normalized);
if (uuid != null) {
return removeWhitelistUuid(uuid.toString());
}
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 String getMotd() {
return colorizeLines(config.getStringList("motd.lines"));
}
public String getKickMessage() {
return colorizeLines(config.getStringList("kick-message"));
}
public void refreshBossBar() {
clearBossBar();
if (!isEnabled() || !isBossBarEnabled()) {
return;
}
bossBar = plugin.getServer().createBossBar(
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;
}
if (canJoin(player)) {
bossBar.removePlayer(player);
return;
}
bossBar.addPlayer(player);
}
public void removeBossBarPlayer(Player player) {
if (bossBar != null && player != null) {
bossBar.removePlayer(player);
}
}
public void shutdown() {
clearBossBar();
}
private void clearBossBar() {
if (bossBar == null) {
return;
}
bossBar.removeAll();
bossBar = null;
}
private boolean isBossBarEnabled() {
return config.getBoolean("bossbar.enabled", true);
}
private BarColor readBossBarColor() {
try {
return BarColor.valueOf(config.getString("bossbar.color", "RED").toUpperCase(Locale.ROOT));
} catch (IllegalArgumentException ignored) {
return BarColor.RED;
}
}
private BarStyle readBossBarStyle() {
try {
return BarStyle.valueOf(config.getString("bossbar.style", "SOLID").toUpperCase(Locale.ROOT));
} catch (IllegalArgumentException ignored) {
return BarStyle.SOLID;
}
}
private double readBossBarProgress() {
double progress = config.getDouble("bossbar.progress", 1.0D);
if (!Double.isFinite(progress)) {
return 1.0D;
}
return Math.max(0.0D, Math.min(1.0D, progress));
}
private boolean addWhitelistUuid(String uuid) {
return updateWhitelist("whitelist.uuids", uuid.toLowerCase(Locale.ROOT), true);
}
private boolean addWhitelistName(String name) {
return updateWhitelist("whitelist.names", normalizeName(name), true);
}
private boolean removeWhitelistUuid(String uuid) {
return updateWhitelist("whitelist.uuids", uuid.toLowerCase(Locale.ROOT), false);
}
private boolean removeWhitelistName(String name) {
return updateWhitelist("whitelist.names", normalizeName(name), false);
}
private boolean updateWhitelist(String path, String value, boolean add) {
if (value == null || value.isBlank()) {
return false;
}
Set<String> entries = path.endsWith(".names") ? getWhitelistNames() : getWhitelistUuids();
boolean changed;
if (add) {
changed = entries.add(value);
} else {
changed = entries.remove(value);
}
if (changed) {
config.set(path, new ArrayList<>(entries));
save();
refreshBossBar();
}
return changed;
}
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 String colorizeLines(List<String> lines) {
if (lines == null || lines.isEmpty()) {
return "";
}
return String.join("\n", lines.stream()
.map(this::colorize)
.toList());
}
private String colorize(String text) {
return ChatColor.translateAlternateColorCodes('&', text == null ? "" : text);
}
private void save() {
try {
config.save(configFile);
} catch (IOException e) {
plugin.getLogger().warning("保存 maintenance.yml 失败: " + e.getMessage());
}
}
}
@@ -0,0 +1,825 @@
package cn.infstar.essentialsC.teleport;
import cn.infstar.essentialsC.EssentialsC;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.event.ClickEvent;
import net.kyori.adventure.text.event.HoverEvent;
import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.player.PlayerMoveEvent;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.scheduler.BukkitTask;
import java.io.File;
import java.io.IOException;
import java.time.Instant;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Deque;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.UUID;
import java.util.function.Predicate;
public final class TeleportRequestManager implements Listener {
public static final String BYPASS_WARMUP_PERMISSION = "essentialsc.tpa.bypass-warmup";
public static final String BYPASS_COOLDOWN_PERMISSION = "essentialsc.tpa.bypass-cooldown";
private final EssentialsC plugin;
private final Map<UUID, Deque<TeleportRequest>> requests = new HashMap<>();
private final Map<UUID, PendingTeleport> warmups = new HashMap<>();
private final Map<UUID, Long> sendCooldowns = new HashMap<>();
private final Map<UUID, Long> acceptCooldowns = new HashMap<>();
private final Set<UUID> ignoringRequests = new HashSet<>();
private final File ignoreFile;
private BukkitTask cleanupTask;
private int timeoutSeconds;
private boolean strictTpaRequests;
private boolean strictTpaHereRequests;
private int warmupSeconds;
private boolean cancelWarmupOnMove;
private boolean cancelWarmupOnDamage;
private boolean cooldownsEnabled;
private int sendCooldownSeconds;
private int acceptCooldownSeconds;
private double warmupMoveThreshold;
private String warmupDisplay;
private boolean soundsEnabled;
private String requestSound;
private String warmupSound;
private String cancelSound;
private String completeSound;
public TeleportRequestManager(EssentialsC plugin) {
this.plugin = plugin;
this.ignoreFile = new File(plugin.getDataFolder(), "teleport-ignore.yml");
reload();
}
public void reload() {
plugin.getConfig().addDefault("tpa.timeout-seconds", 60);
plugin.getConfig().addDefault("tpa.strict-tpa-requests", false);
plugin.getConfig().addDefault("tpa.strict-tpahere-requests", true);
plugin.getConfig().addDefault("tpa.warmup-seconds", 5);
plugin.getConfig().addDefault("tpa.cancel-warmup-on-move", true);
plugin.getConfig().addDefault("tpa.cancel-warmup-on-damage", true);
plugin.getConfig().addDefault("tpa.cooldowns.enabled", true);
plugin.getConfig().addDefault("tpa.cooldowns.cooldown-times.SEND_TELEPORT_REQUEST", 0);
plugin.getConfig().addDefault("tpa.cooldowns.cooldown-times.ACCEPT_TELEPORT_REQUEST", 0);
plugin.getConfig().addDefault("tpa.warmup-move-threshold", 0.1D);
plugin.getConfig().addDefault("tpa.warmup-display", "actionbar");
plugin.getConfig().addDefault("tpa.sounds.enabled", true);
plugin.getConfig().addDefault("tpa.sounds.request-received", "entity.experience_orb.pickup");
plugin.getConfig().addDefault("tpa.sounds.warmup", "block.note_block.banjo");
plugin.getConfig().addDefault("tpa.sounds.cancelled", "entity.item.break");
plugin.getConfig().addDefault("tpa.sounds.complete", "entity.enderman.teleport");
plugin.getConfig().options().copyDefaults(true);
plugin.saveConfig();
timeoutSeconds = Math.max(5, plugin.getConfig().getInt("tpa.timeout-seconds", 60));
strictTpaRequests = plugin.getConfig().getBoolean("tpa.strict-tpa-requests", false);
strictTpaHereRequests = plugin.getConfig().getBoolean("tpa.strict-tpahere-requests", true);
warmupSeconds = Math.max(0, plugin.getConfig().getInt("tpa.warmup-seconds", 5));
cancelWarmupOnMove = plugin.getConfig().getBoolean("tpa.cancel-warmup-on-move", true);
cancelWarmupOnDamage = plugin.getConfig().getBoolean("tpa.cancel-warmup-on-damage", true);
cooldownsEnabled = plugin.getConfig().getBoolean("tpa.cooldowns.enabled", true);
sendCooldownSeconds = Math.max(0, plugin.getConfig().getInt("tpa.cooldowns.cooldown-times.SEND_TELEPORT_REQUEST", 0));
acceptCooldownSeconds = Math.max(0, plugin.getConfig().getInt("tpa.cooldowns.cooldown-times.ACCEPT_TELEPORT_REQUEST", 0));
warmupMoveThreshold = Math.max(0.0D, plugin.getConfig().getDouble("tpa.warmup-move-threshold", 0.1D));
warmupDisplay = plugin.getConfig().getString("tpa.warmup-display", "actionbar").toLowerCase();
soundsEnabled = plugin.getConfig().getBoolean("tpa.sounds.enabled", true);
requestSound = plugin.getConfig().getString("tpa.sounds.request-received", "entity.experience_orb.pickup");
warmupSound = plugin.getConfig().getString("tpa.sounds.warmup", "block.note_block.banjo");
cancelSound = plugin.getConfig().getString("tpa.sounds.cancelled", "entity.item.break");
completeSound = plugin.getConfig().getString("tpa.sounds.complete", "entity.enderman.teleport");
loadIgnoringRequests();
startCleanupTask();
}
public void shutdown() {
requests.clear();
sendCooldowns.clear();
acceptCooldowns.clear();
cancelAllWarmups();
cancelCleanupTask();
saveIgnoringRequests();
}
public CreateRequestResult createRequest(Player requester, Player target, TeleportRequest.Type type) {
return createRequest(requester, target, type, true);
}
private CreateRequestResult createRequest(Player requester, Player target, TeleportRequest.Type type, boolean applyCooldown) {
OptionalIntCooldown sendCooldown = getRemainingCooldown(requester, sendCooldowns);
if (applyCooldown && sendCooldown.active()) {
return new CreateRequestResult(CreateRequestStatus.ON_COOLDOWN, null, sendCooldown.seconds());
}
Optional<TeleportRequest> existingRequest = findIncoming(target, requester.getName());
if (existingRequest.isPresent()
&& existingRequest.get().type() == type
&& !existingRequest.get().hasExpired()) {
return new CreateRequestResult(CreateRequestStatus.DUPLICATE, existingRequest.get());
}
TeleportRequest request = new TeleportRequest(
requester.getUniqueId(),
requester.getName(),
requester.getLocation().clone(),
target.getUniqueId(),
target.getName(),
target.getLocation().clone(),
type,
Instant.now().plusSeconds(timeoutSeconds).toEpochMilli(),
TeleportRequest.Status.PENDING
);
if (isIgnoringRequests(target)) {
request.setStatus(TeleportRequest.Status.IGNORED);
if (applyCooldown) {
startCooldown(requester, sendCooldowns, sendCooldownSeconds);
}
return new CreateRequestResult(CreateRequestStatus.IGNORED, request);
}
Deque<TeleportRequest> targetRequests = requests.computeIfAbsent(target.getUniqueId(), ignored -> new ArrayDeque<>());
targetRequests.addFirst(request);
if (applyCooldown) {
startCooldown(requester, sendCooldowns, sendCooldownSeconds);
}
return new CreateRequestResult(CreateRequestStatus.SUCCESS, request, 0);
}
public Optional<TeleportRequest> findIncoming(Player target, String requesterName) {
Deque<TeleportRequest> targetRequests = requests.getOrDefault(target.getUniqueId(), new ArrayDeque<>());
if (requesterName == null) {
return targetRequests.stream().findFirst();
}
Optional<TeleportRequest> unexpired = targetRequests.stream()
.filter(request -> request.requesterName().equalsIgnoreCase(requesterName))
.filter(request -> !request.hasExpired())
.findFirst();
if (unexpired.isPresent()) {
return unexpired;
}
return targetRequests.stream()
.filter(request -> request.requesterName().equalsIgnoreCase(requesterName))
.findFirst();
}
public Optional<TeleportRequest> findOutgoing(Player requester, String targetName) {
return requests.values().stream()
.flatMap(Deque::stream)
.filter(request -> request.requesterId().equals(requester.getUniqueId()))
.filter(request -> !request.hasExpired())
.filter(request -> targetName == null || request.targetName().equalsIgnoreCase(targetName))
.max(Comparator.comparingLong(TeleportRequest::expiresAtMillis));
}
public List<String> getIncomingRequesterNames(Player target, String partial) {
String partialLower = partial == null ? "" : partial.toLowerCase();
return requests.getOrDefault(target.getUniqueId(), new ArrayDeque<>()).stream()
.filter(request -> !request.hasExpired())
.map(TeleportRequest::requesterName)
.filter(name -> name.toLowerCase().startsWith(partialLower))
.distinct()
.sorted(String.CASE_INSENSITIVE_ORDER)
.toList();
}
public List<String> getOutgoingTargetNames(Player requester, String partial) {
String partialLower = partial == null ? "" : partial.toLowerCase();
return requests.values().stream()
.flatMap(Deque::stream)
.filter(request -> request.requesterId().equals(requester.getUniqueId()))
.filter(request -> !request.hasExpired())
.map(TeleportRequest::targetName)
.filter(name -> name.toLowerCase().startsWith(partialLower))
.distinct()
.sorted(String.CASE_INSENSITIVE_ORDER)
.toList();
}
public TeleportResult accept(Player target, TeleportRequest request) {
OptionalIntCooldown acceptCooldown = getRemainingCooldown(target, acceptCooldowns);
if (acceptCooldown.active()) {
return TeleportResult.onCooldown(acceptCooldown.seconds());
}
if (request.hasExpired()) {
removeIncomingByRequester(target, request.requesterName());
return TeleportResult.EXPIRED;
}
Player requester = Bukkit.getPlayer(request.requesterId());
Player currentTarget = Bukkit.getPlayer(request.targetId());
if (requester == null || currentTarget == null || !requester.isOnline() || !currentTarget.isOnline()) {
return TeleportResult.PLAYER_OFFLINE;
}
TeleportPlan plan = createTeleportPlan(request, requester, currentTarget);
Player teleporter = plan.teleporter();
if (warmups.containsKey(teleporter.getUniqueId())) {
return TeleportResult.ALREADY_WARMING_UP;
}
removeIncomingByRequester(target, request.requesterName());
request.setStatus(TeleportRequest.Status.ACCEPTED);
if (warmupSeconds <= 0 || teleporter.hasPermission(BYPASS_WARMUP_PERMISSION)) {
TeleportResult result = executeTeleport(plan, true);
if (result.status() == TeleportResult.Status.SUCCESS) {
startCooldown(target, acceptCooldowns, acceptCooldownSeconds);
}
return result;
}
startWarmup(plan);
startCooldown(target, acceptCooldowns, acceptCooldownSeconds);
return TeleportResult.WARMING_UP;
}
public TeleportResult deny(Player target, TeleportRequest request) {
if (!removeIncomingByRequester(target, request.requesterName())) {
return TeleportResult.EXPIRED;
}
if (request.hasExpired()) {
return TeleportResult.EXPIRED;
}
request.setStatus(TeleportRequest.Status.DECLINED);
return TeleportResult.SUCCESS;
}
public boolean cancel(TeleportRequest request) {
Deque<TeleportRequest> targetRequests = requests.get(request.targetId());
if (targetRequests == null) {
return false;
}
boolean removed = targetRequests.removeIf(candidate ->
candidate.requesterName().equalsIgnoreCase(request.requesterName()));
if (targetRequests.isEmpty()) {
requests.remove(request.targetId());
}
return removed;
}
public boolean isIgnoringRequests(Player player) {
return ignoringRequests.contains(player.getUniqueId());
}
public boolean toggleIgnoringRequests(Player player) {
UUID uuid = player.getUniqueId();
boolean nowIgnoring;
if (ignoringRequests.contains(uuid)) {
ignoringRequests.remove(uuid);
nowIgnoring = false;
} else {
ignoringRequests.add(uuid);
nowIgnoring = true;
}
saveIgnoringRequests();
return nowIgnoring;
}
public void playRequestReceivedSound(Player player) {
playConfiguredSound(player, requestSound, 0.7F, 1.0F);
}
public int sendTeleportAllRequest(Player requester) {
return sendTeleportAllRequest(requester, ignored -> true);
}
public int sendTeleportAllRequest(Player requester, Predicate<Player> targetFilter) {
OptionalIntCooldown sendCooldown = getRemainingCooldown(requester, sendCooldowns);
if (sendCooldown.active()) {
return -sendCooldown.seconds();
}
int recipients = 0;
for (Player target : Bukkit.getOnlinePlayers()) {
if (target.getUniqueId().equals(requester.getUniqueId())) {
continue;
}
if (!targetFilter.test(target)) {
continue;
}
recipients++;
CreateRequestResult result = createRequest(requester, target, TeleportRequest.Type.TPAHERE, false);
if (result.status() != CreateRequestStatus.SUCCESS) {
continue;
}
Map<String, String> placeholders = placeholders(result.request());
target.sendMessage(plugin.getLangManager().getPrefixedString("tpa.messages.received-tpahere", placeholders));
sendResponseHint(target, result.request(), placeholders);
playRequestReceivedSound(target);
}
if (recipients > 0) {
startCooldown(requester, sendCooldowns, sendCooldownSeconds);
}
return recipients;
}
public int getSendCooldownSeconds(Player player) {
return getRemainingCooldown(player, sendCooldowns).seconds();
}
private void sendResponseHint(Player target, TeleportRequest request, Map<String, String> placeholders) {
String requesterName = request.requesterName();
String acceptCommand = "/tpaccept " + requesterName;
String denyCommand = "/tpdeny " + requesterName;
Component hint = LegacyComponentSerializer.legacySection()
.deserialize(plugin.getLangManager().getPrefixedString("tpa.messages.response-hint", placeholders));
Component accept = LegacyComponentSerializer.legacySection()
.deserialize(plugin.getLangManager().getString("tpa.messages.accept-button"))
.clickEvent(ClickEvent.runCommand(acceptCommand))
.hoverEvent(HoverEvent.showText(Component.text(acceptCommand, NamedTextColor.GREEN)));
Component deny = LegacyComponentSerializer.legacySection()
.deserialize(plugin.getLangManager().getString("tpa.messages.deny-button"))
.clickEvent(ClickEvent.runCommand(denyCommand))
.hoverEvent(HoverEvent.showText(Component.text(denyCommand, NamedTextColor.RED)));
target.sendMessage(hint.append(Component.space()).append(accept).append(Component.space()).append(deny));
}
public int getTimeoutSeconds() {
return timeoutSeconds;
}
private OptionalIntCooldown getRemainingCooldown(Player player, Map<UUID, Long> cooldowns) {
if (player.hasPermission(BYPASS_COOLDOWN_PERMISSION)) {
return OptionalIntCooldown.inactive();
}
if (!cooldownsEnabled) {
return OptionalIntCooldown.inactive();
}
long expiresAt = cooldowns.getOrDefault(player.getUniqueId(), 0L);
long now = System.currentTimeMillis();
if (expiresAt <= now) {
cooldowns.remove(player.getUniqueId());
return OptionalIntCooldown.inactive();
}
int seconds = (int) Math.ceil((expiresAt - now) / 1000.0D);
return new OptionalIntCooldown(true, Math.max(1, seconds));
}
private void startCooldown(Player player, Map<UUID, Long> cooldowns, int seconds) {
if (!cooldownsEnabled || seconds <= 0 || player.hasPermission(BYPASS_COOLDOWN_PERMISSION)) {
return;
}
cooldowns.put(player.getUniqueId(), System.currentTimeMillis() + seconds * 1000L);
}
private TeleportPlan createTeleportPlan(TeleportRequest request, Player requester, Player currentTarget) {
if (request.type() == TeleportRequest.Type.TPA) {
return new TeleportPlan(
requester,
strictTpaRequests ? currentTarget.getLocation().clone() : null,
strictTpaRequests ? null : currentTarget.getUniqueId()
);
}
return new TeleportPlan(
currentTarget,
strictTpaHereRequests ? request.requesterLocation().clone() : null,
strictTpaHereRequests ? null : requester.getUniqueId()
);
}
private void startWarmup(TeleportPlan plan) {
Player teleporter = plan.teleporter();
UUID uuid = teleporter.getUniqueId();
PendingTeleport pendingTeleport = new PendingTeleport(
plan,
teleporter.getLocation().clone(),
warmupSeconds
);
BukkitTask task = Bukkit.getScheduler().runTaskTimer(plugin, () -> tickWarmup(uuid), 0L, 20L);
pendingTeleport.setTask(task);
warmups.put(uuid, pendingTeleport);
teleporter.sendMessage(plugin.getLangManager().getPrefixedString("tpa.messages.warmup-start",
Map.of("seconds", String.valueOf(warmupSeconds))));
}
private void tickWarmup(UUID teleporterId) {
PendingTeleport pendingTeleport = warmups.get(teleporterId);
if (pendingTeleport == null) {
return;
}
Player teleporter = Bukkit.getPlayer(teleporterId);
if (teleporter == null || !teleporter.isOnline()) {
cancelWarmup(teleporterId, null, false);
return;
}
if (pendingTeleport.remainingSeconds() <= 0) {
cancelWarmup(teleporterId, null, false);
TeleportResult result = executeTeleport(pendingTeleport.plan(), true);
if (result.status() == TeleportResult.Status.PLAYER_OFFLINE) {
teleporter.sendMessage(plugin.getLangManager().getPrefixedString("tpa.messages.player-offline"));
}
return;
}
sendWarmupStatus(teleporter, pendingTeleport.remainingSeconds());
playConfiguredSound(teleporter, warmupSound, 0.5F, 1.0F);
pendingTeleport.decrementRemainingSeconds();
}
private TeleportResult executeTeleport(TeleportPlan plan, boolean notifyCompletion) {
Player teleporter = plan.teleporter();
if (!teleporter.isOnline()) {
return TeleportResult.PLAYER_OFFLINE;
}
Location destination = plan.fixedDestination();
if (destination == null && plan.dynamicTargetId() != null) {
Player dynamicTarget = Bukkit.getPlayer(plan.dynamicTargetId());
if (dynamicTarget == null || !dynamicTarget.isOnline()) {
return TeleportResult.PLAYER_OFFLINE;
}
destination = dynamicTarget.getLocation().clone();
}
if (destination == null) {
return TeleportResult.PLAYER_OFFLINE;
}
teleporter.teleportAsync(destination).thenAccept(success -> {
if (!success || !notifyCompletion) {
return;
}
Bukkit.getScheduler().runTask(plugin, () -> {
if (teleporter.isOnline()) {
teleporter.sendMessage(plugin.getLangManager().getPrefixedString("tpa.messages.teleport-complete"));
playConfiguredSound(teleporter, completeSound, 0.7F, 1.0F);
}
});
});
return TeleportResult.SUCCESS;
}
private void sendWarmupStatus(Player player, int seconds) {
String message = plugin.getLangManager().getString("tpa.messages.warmup-status",
Map.of("seconds", String.valueOf(seconds)));
if ("actionbar".equalsIgnoreCase(warmupDisplay)) {
player.sendActionBar(LegacyComponentSerializer.legacySection().deserialize(message));
return;
}
if (!"none".equalsIgnoreCase(warmupDisplay)) {
player.sendMessage(message);
}
}
private void cancelWarmup(UUID teleporterId, String messagePath, boolean playSound) {
PendingTeleport pendingTeleport = warmups.remove(teleporterId);
if (pendingTeleport == null) {
return;
}
if (pendingTeleport.task() != null) {
pendingTeleport.task().cancel();
}
Player player = Bukkit.getPlayer(teleporterId);
if (player != null && player.isOnline() && messagePath != null) {
player.sendMessage(plugin.getLangManager().getPrefixedString(messagePath));
if (playSound) {
playConfiguredSound(player, cancelSound, 0.7F, 1.0F);
}
}
}
private void cancelAllWarmups() {
List<UUID> warmingPlayers = new ArrayList<>(warmups.keySet());
for (UUID warmingPlayer : warmingPlayers) {
cancelWarmup(warmingPlayer, null, false);
}
}
private void playConfiguredSound(Player player, String sound, float volume, float pitch) {
if (!soundsEnabled || sound == null || sound.isBlank()) {
return;
}
try {
player.playSound(player.getLocation(), sound, volume, pitch);
} catch (IllegalArgumentException ignored) {
plugin.getLogger().warning("无效的 TPA 音效配置: " + sound);
}
}
private boolean removeIncomingByRequester(Player target, String requesterName) {
Deque<TeleportRequest> targetRequests = requests.get(target.getUniqueId());
if (targetRequests == null) {
return false;
}
boolean removed = targetRequests.removeIf(request ->
request.requesterName().equalsIgnoreCase(requesterName));
if (targetRequests.isEmpty()) {
requests.remove(target.getUniqueId());
}
return removed;
}
public void purgeExpired() {
List<UUID> emptyQueues = new ArrayList<>();
for (Map.Entry<UUID, Deque<TeleportRequest>> entry : requests.entrySet()) {
entry.getValue().removeIf(TeleportRequest::hasExpired);
if (entry.getValue().isEmpty()) {
emptyQueues.add(entry.getKey());
}
}
emptyQueues.forEach(requests::remove);
}
public Map<String, String> placeholders(TeleportRequest request) {
Map<String, String> placeholders = new HashMap<>();
placeholders.put("requester", request.requesterName());
placeholders.put("target", request.targetName());
placeholders.put("seconds", String.valueOf(timeoutSeconds));
placeholders.put("type", request.type().name().toLowerCase());
return placeholders;
}
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
private void onPlayerMove(PlayerMoveEvent event) {
if (!cancelWarmupOnMove || !warmups.containsKey(event.getPlayer().getUniqueId())) {
return;
}
PendingTeleport pendingTeleport = warmups.get(event.getPlayer().getUniqueId());
Location start = pendingTeleport.startLocation();
Location to = event.getTo();
if (to == null || !sameWorld(start, to)) {
cancelWarmup(event.getPlayer().getUniqueId(), "tpa.messages.warmup-cancelled-move", true);
return;
}
double distance = Math.abs(start.getX() - to.getX())
+ Math.abs(start.getY() - to.getY())
+ Math.abs(start.getZ() - to.getZ());
if (distance > warmupMoveThreshold) {
cancelWarmup(event.getPlayer().getUniqueId(), "tpa.messages.warmup-cancelled-move", true);
}
}
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
private void onEntityDamage(EntityDamageEvent event) {
if (cancelWarmupOnDamage && event.getEntity() instanceof Player player && warmups.containsKey(player.getUniqueId())) {
cancelWarmup(player.getUniqueId(), "tpa.messages.warmup-cancelled-damage", true);
}
}
@EventHandler
private void onPlayerJoin(PlayerJoinEvent event) {
if (!isIgnoringRequests(event.getPlayer())) {
return;
}
event.getPlayer().sendMessage(plugin.getLangManager().getPrefixedString("tpa.messages.ignore-notification"));
}
@EventHandler
private void onPlayerQuit(PlayerQuitEvent event) {
cancelWarmup(event.getPlayer().getUniqueId(), null, false);
}
private void startCleanupTask() {
if (cleanupTask != null) {
return;
}
cleanupTask = Bukkit.getScheduler().runTaskTimer(plugin, this::purgeExpired, 20L * 60L, 20L * 60L);
}
private void cancelCleanupTask() {
if (cleanupTask == null) {
return;
}
cleanupTask.cancel();
cleanupTask = null;
}
private boolean sameWorld(Location first, Location second) {
return first.getWorld() != null
&& second.getWorld() != null
&& first.getWorld().getUID().equals(second.getWorld().getUID());
}
private void loadIgnoringRequests() {
ignoringRequests.clear();
if (!ignoreFile.exists()) {
return;
}
FileConfiguration ignoreConfig = YamlConfiguration.loadConfiguration(ignoreFile);
if (!ignoreConfig.isConfigurationSection("ignored")) {
return;
}
for (String key : ignoreConfig.getConfigurationSection("ignored").getKeys(false)) {
if (!ignoreConfig.getBoolean("ignored." + key, false)) {
continue;
}
try {
ignoringRequests.add(UUID.fromString(key));
} catch (IllegalArgumentException ignored) {
plugin.getLogger().warning("忽略无效的 TPA 忽略记录 UUID: " + key);
}
}
}
private void saveIgnoringRequests() {
FileConfiguration ignoreConfig = new YamlConfiguration();
for (UUID uuid : ignoringRequests) {
ignoreConfig.set("ignored." + uuid, true);
}
try {
ignoreConfig.save(ignoreFile);
} catch (IOException e) {
plugin.getLogger().warning("保存 teleport-ignore.yml 失败: " + e.getMessage());
}
}
public enum CreateRequestStatus {
SUCCESS,
DUPLICATE,
IGNORED,
ON_COOLDOWN
}
public record TeleportResult(Status status, int cooldownSeconds) {
public static final TeleportResult SUCCESS = new TeleportResult(Status.SUCCESS, 0);
public static final TeleportResult WARMING_UP = new TeleportResult(Status.WARMING_UP, 0);
public static final TeleportResult EXPIRED = new TeleportResult(Status.EXPIRED, 0);
public static final TeleportResult PLAYER_OFFLINE = new TeleportResult(Status.PLAYER_OFFLINE, 0);
public static final TeleportResult ALREADY_WARMING_UP = new TeleportResult(Status.ALREADY_WARMING_UP, 0);
public static TeleportResult onCooldown(int seconds) {
return new TeleportResult(Status.ON_COOLDOWN, seconds);
}
public enum Status {
SUCCESS,
WARMING_UP,
EXPIRED,
PLAYER_OFFLINE,
ALREADY_WARMING_UP,
ON_COOLDOWN
}
}
public record CreateRequestResult(CreateRequestStatus status, TeleportRequest request, int cooldownSeconds) {
public CreateRequestResult(CreateRequestStatus status, TeleportRequest request) {
this(status, request, 0);
}
}
public static final class TeleportRequest {
private final UUID requesterId;
private final String requesterName;
private final Location requesterLocation;
private final UUID targetId;
private final String targetName;
private final Location targetLocation;
private final Type type;
private final long expiresAtMillis;
private Status status;
public TeleportRequest(UUID requesterId, String requesterName, Location requesterLocation,
UUID targetId, String targetName, Location targetLocation,
Type type, long expiresAtMillis, Status status) {
this.requesterId = requesterId;
this.requesterName = requesterName;
this.requesterLocation = requesterLocation;
this.targetId = targetId;
this.targetName = targetName;
this.targetLocation = targetLocation;
this.type = type;
this.expiresAtMillis = expiresAtMillis;
this.status = status;
}
public UUID requesterId() {
return requesterId;
}
public String requesterName() {
return requesterName;
}
public Location requesterLocation() {
return requesterLocation;
}
public UUID targetId() {
return targetId;
}
public String targetName() {
return targetName;
}
public Location targetLocation() {
return targetLocation;
}
public Type type() {
return type;
}
public long expiresAtMillis() {
return expiresAtMillis;
}
public Status status() {
return status;
}
public void setStatus(Status status) {
this.status = status;
}
public boolean hasExpired() {
return Instant.now().isAfter(Instant.ofEpochMilli(expiresAtMillis));
}
public enum Type {
TPA,
TPAHERE
}
public enum Status {
PENDING,
ACCEPTED,
DECLINED,
IGNORED
}
}
private record TeleportPlan(Player teleporter, Location fixedDestination, UUID dynamicTargetId) {
}
private record OptionalIntCooldown(boolean active, int seconds) {
private static OptionalIntCooldown inactive() {
return new OptionalIntCooldown(false, 0);
}
}
private static final class PendingTeleport {
private final TeleportPlan plan;
private final Location startLocation;
private int remainingSeconds;
private BukkitTask task;
private PendingTeleport(TeleportPlan plan, Location startLocation, int remainingSeconds) {
this.plan = plan;
this.startLocation = startLocation;
this.remainingSeconds = remainingSeconds;
}
private TeleportPlan plan() {
return plan;
}
private Location startLocation() {
return startLocation;
}
private int remainingSeconds() {
return remainingSeconds;
}
private void decrementRemainingSeconds() {
remainingSeconds--;
}
private BukkitTask task() {
return task;
}
private void setTask(BukkitTask task) {
this.task = task;
}
}
}
+43
View File
@@ -6,6 +6,9 @@ config-version: 2
# 语言文件名称,对应插件数据目录下 lang/<语言名>.yml # 语言文件名称,对应插件数据目录下 lang/<语言名>.yml
language: "zh_CN" language: "zh_CN"
# 是否输出更详细的调试日志。
debug: false
admin-mode: admin-mode:
# 原版默认飞行速度为 0.1,这里 0.2 表示两倍飞行速度 # 原版默认飞行速度为 0.1,这里 0.2 表示两倍飞行速度
fly-speed: 0.2 fly-speed: 0.2
@@ -18,6 +21,8 @@ jei-sync:
enabled: true enabled: true
# 是否输出调试日志 # 是否输出调试日志
debug: false debug: false
# 玩家加入后延迟多少 tick 再检测客户端品牌,避免品牌信息尚未同步完成。
brand-check-delay-ticks: 20
# 是否在玩家加入时发送同步提示 # 是否在玩家加入时发送同步提示
send-player-message: true send-player-message: true
@@ -32,6 +37,44 @@ tpsbar:
# on: 始终启用插件实现;若服务端已有原生命令,则自动跳过以避免冲突 # on: 始终启用插件实现;若服务端已有原生命令,则自动跳过以避免冲突
mode: auto mode: auto
tpa:
# TPA 请求有效时间,单位为秒
timeout-seconds: 60
# 是否让 /tpa 接受后传送到接受时目标所在的位置快照,而不是传送完成时目标当前位置。
strict-tpa-requests: false
# 是否让 /tpahere 接受后传送到请求发起时的位置,而不是请求者当前所在位置。
# 该行为与 HuskHomes 的 strict_tpa_here_requests 默认值一致。
strict-tpahere-requests: true
# 接受请求后的传送预热时间,单位为秒。设置为 0 可关闭预热。
warmup-seconds: 5
# 预热期间移动是否取消传送。
cancel-warmup-on-move: true
# 预热期间受到伤害是否取消传送。
cancel-warmup-on-damage: true
cooldowns:
# 是否启用 TPA 冷却系统。
enabled: true
cooldown-times:
# 发送传送请求后的冷却时间,单位为秒。0 表示关闭。
SEND_TELEPORT_REQUEST: 0
# 接受传送请求后的冷却时间,单位为秒。0 表示关闭。
ACCEPT_TELEPORT_REQUEST: 0
# 判断移动取消的曼哈顿距离阈值。0.1 与 HuskHomes 行为接近,可避免只转头就取消。
warmup-move-threshold: 0.1
# 预热倒计时显示位置:actionbar / chat / none。
warmup-display: actionbar
sounds:
# 是否播放 TPA 相关音效。
enabled: true
# 收到请求时播放的音效。
request-received: "entity.experience_orb.pickup"
# 预热倒计时时播放的音效。
warmup: "block.note_block.banjo"
# 预热被取消时播放的音效。
cancelled: "entity.item.break"
# 传送完成时播放的音效。
complete: "entity.enderman.teleport"
blocks-menu: blocks-menu:
# 菜单布局版本,用于后续自动迁移槽位布局 # 菜单布局版本,用于后续自动迁移槽位布局
layout-version: 2 layout-version: 2
+68
View File
@@ -10,6 +10,7 @@ messages:
paper-version: "&7Running on Paper {version}" paper-version: "&7Running on Paper {version}"
unknown-subcommand: "&cUnknown subcommand: {command}" unknown-subcommand: "&cUnknown subcommand: {command}"
help-usage: "&7Use &f/essc help &7to view available commands." help-usage: "&7Use &f/essc help &7to view available commands."
module-disabled: "&cThis feature module is currently disabled. Please contact an administrator."
blocks-menu-empty: "&cYou do not currently have any available shortcut menu entries." blocks-menu-empty: "&cYou do not currently have any available shortcut menu entries."
hat-success: "&aYou are now wearing {item} on your head!" hat-success: "&aYou are now wearing {item} on your head!"
@@ -81,8 +82,55 @@ help:
seen: " &f/seen &7- View player information" seen: " &f/seen &7- View player information"
feed: " &f/feed &7- Restore hunger" feed: " &f/feed &7- Restore hunger"
repair: " &f/repair &7- Repair held or all items" repair: " &f/repair &7- Repair held or all items"
tpa: " &f/tpa <player> &7- Request to teleport to a player"
tpahere: " &f/tpahere <player> &7- Request a player teleport to you"
tpaall: " &f/tpaall &7- Request all players teleport to you"
tpaccept: " &f/tpaccept [player] &7- Accept a teleport request"
tpdeny: " &f/tpdeny [player] &7- Deny a teleport request"
tpignore: " &f/tpignore &7- Toggle ignoring teleport requests"
admin: " &f/essc admin &7- Toggle admin mode" admin: " &f/essc admin &7- Toggle admin mode"
tpsbar: " &f/tpsbar [player] &7- Toggle TPS boss bar" tpsbar: " &f/tpsbar [player] &7- Toggle TPS boss bar"
maintenance: " &f/maintenance <on|off|status|reload|add|remove|list> &7- Manage maintenance mode"
tpa:
messages:
usage-tpa: "&cUsage: /tpa <player>"
usage-tpahere: "&cUsage: /tpahere <player>"
usage-tpaall: "&cUsage: /tpaall"
usage-tpaccept: "&cUsage: /tpaccept [player]"
usage-tpdeny: "&cUsage: /tpdeny [player]"
self: "&cYou cannot send a teleport request to yourself."
sent-tpa: "&aSent a teleport request to {target}. It expires in {seconds} seconds."
sent-tpahere: "&aInvited {target} to teleport to you. The request expires in {seconds} seconds."
duplicate-request: "&eYou already have a pending request of this type for {target}."
ignoring-requests: "&cYou are currently ignoring teleport requests."
send-cooldown: "&cPlease wait {seconds} seconds before sending another teleport request."
accept-cooldown: "&cPlease wait {seconds} seconds before accepting another teleport request."
received-tpa: "&e{requester} wants to teleport to you."
received-tpahere: "&e{requester} invited you to teleport to them."
response-hint: "&7Type &f/tpaccept {requester} &7to accept or &f/tpdeny {requester} &7to deny."
accept-button: "&a[Accept]"
deny-button: "&c[Deny]"
no-request: "&cYou do not have any pending teleport requests."
accepted-target: "&aAccepted {requester}'s teleport request."
accepted-sender: "&a{target} accepted your teleport request."
denied-target: "&cDenied {requester}'s teleport request."
denied-sender: "&c{target} denied your teleport request."
expired: "&cYour pending teleport request has expired."
expired-sender: "&cYour teleport request to {target} expired."
expired-target: "&cThe teleport request from {requester} expired."
player-offline: "&cTeleport failed because a player in the request is now offline."
already-warming-up: "&cA related player is already warming up for teleportation."
warmup-start: "&eTeleporting in {seconds} seconds. Do not move or take damage."
warmup-status: "&eTeleporting in {seconds} seconds"
warmup-cancelled-move: "&cTeleport cancelled because you moved during warmup."
warmup-cancelled-damage: "&cTeleport cancelled because you took damage during warmup."
teleport-complete: "&aTeleport complete."
ignore-enabled: "&eYou are now ignoring teleport requests."
ignore-disabled: "&aYou are now accepting teleport requests."
ignore-notification: "&7You are currently ignoring teleport requests."
tpaall-sent: "&aSent teleport requests to all players."
tpaall-no-targets: "&cThere are no online players who can receive the request."
blocks-menu: blocks-menu:
title: "&6&lEssentialsC &8- &e&lShortcut Menu" title: "&6&lEssentialsC &8- &e&lShortcut Menu"
@@ -169,3 +217,23 @@ mobdrops-menu:
name: "&dEnderman Drops" name: "&dEnderman Drops"
status: "&7Current status: {status}" status: "&7Current status: {status}"
toggle: "&eClick to toggle" toggle: "&eClick to toggle"
maintenance:
status:
enabled: "&cEnabled"
disabled: "&aDisabled"
messages:
enabled: "&aMaintenance mode enabled."
disabled: "&cMaintenance mode disabled."
reloaded: "&aMaintenance configuration reloaded."
status: "&7Maintenance mode status: {status} &8| &7Whitelist: &f{whitelist_count}"
usage: "&cUsage: /maintenance <on|off|status|reload|add|remove|list>"
add-usage: "&cUsage: /maintenance add <player|uuid>"
remove-usage: "&cUsage: /maintenance remove <player|uuid>"
whitelist-added: "&aAdded {player} to the maintenance whitelist."
whitelist-removed: "&aRemoved {player} from the maintenance whitelist."
whitelist-exists: "&e{player} is already on the maintenance whitelist."
whitelist-missing: "&c{player} is not on the maintenance whitelist."
whitelist-empty: "&7The maintenance whitelist is empty."
whitelist-list: "&7Maintenance whitelist ({count}): &f{entries}"
login-blocked: "&e{player} was blocked by maintenance mode. &7UUID: {uuid} &8| &7IP: {address}"
+68
View File
@@ -10,6 +10,7 @@ messages:
paper-version: "&7当前运行于 Paper {version}" paper-version: "&7当前运行于 Paper {version}"
unknown-subcommand: "&c未知子命令:{command}" unknown-subcommand: "&c未知子命令:{command}"
help-usage: "&7使用 &f/essc help &7查看可用命令。" help-usage: "&7使用 &f/essc help &7查看可用命令。"
module-disabled: "&c该功能模块当前已关闭,请联系管理员。"
blocks-menu-empty: "&c你当前没有可用的便捷菜单项目。" blocks-menu-empty: "&c你当前没有可用的便捷菜单项目。"
hat-success: "&a你已将 {item} 戴在头上!" hat-success: "&a你已将 {item} 戴在头上!"
@@ -81,8 +82,55 @@ help:
seen: " &f/seen &7- 查看玩家信息" seen: " &f/seen &7- 查看玩家信息"
feed: " &f/feed &7- 恢复饥饿值" feed: " &f/feed &7- 恢复饥饿值"
repair: " &f/repair &7- 修复手中或全部物品" repair: " &f/repair &7- 修复手中或全部物品"
tpa: " &f/tpa <玩家> &7- 请求传送到玩家身边"
tpahere: " &f/tpahere <玩家> &7- 请求玩家传送到你身边"
tpaall: " &f/tpaall &7- 向所有玩家发送传送到你身边的请求"
tpaccept: " &f/tpaccept [玩家] &7- 接受传送请求"
tpdeny: " &f/tpdeny [玩家] &7- 拒绝传送请求"
tpignore: " &f/tpignore &7- 切换是否忽略传送请求"
admin: " &f/essc admin &7- 切换管理模式" admin: " &f/essc admin &7- 切换管理模式"
tpsbar: " &f/tpsbar [玩家] &7- 切换 TPS 状态栏" tpsbar: " &f/tpsbar [玩家] &7- 切换 TPS 状态栏"
maintenance: " &f/maintenance <on|off|status|reload|add|remove|list> &7- 管理维护模式"
tpa:
messages:
usage-tpa: "&c用法:/tpa <玩家>"
usage-tpahere: "&c用法:/tpahere <玩家>"
usage-tpaall: "&c用法:/tpaall"
usage-tpaccept: "&c用法:/tpaccept [玩家]"
usage-tpdeny: "&c用法:/tpdeny [玩家]"
self: "&c你不能向自己发送传送请求。"
sent-tpa: "&a已向 {target} 发送传送请求,{seconds} 秒后过期。"
sent-tpahere: "&a已邀请 {target} 传送到你身边,{seconds} 秒后过期。"
duplicate-request: "&e你已经向 {target} 发送过同类型传送请求,请等待对方处理。"
ignoring-requests: "&c你当前正在忽略传送请求。"
send-cooldown: "&c请等待 {seconds} 秒后再发送传送请求。"
accept-cooldown: "&c请等待 {seconds} 秒后再接受传送请求。"
received-tpa: "&e{requester} 请求传送到你身边。"
received-tpahere: "&e{requester} 邀请你传送到对方身边。"
response-hint: "&7输入 &f/tpaccept {requester} &7接受,或 &f/tpdeny {requester} &7拒绝。"
accept-button: "&a[接受]"
deny-button: "&c[拒绝]"
no-request: "&c你没有待处理的传送请求。"
accepted-target: "&a你已接受 {requester} 的传送请求。"
accepted-sender: "&a{target} 已接受你的传送请求。"
denied-target: "&c你已拒绝 {requester} 的传送请求。"
denied-sender: "&c{target} 拒绝了你的传送请求。"
expired: "&c你的待处理传送请求已过期。"
expired-sender: "&c你发给 {target} 的传送请求已过期。"
expired-target: "&c来自 {requester} 的传送请求已过期。"
player-offline: "&c无法完成传送,请求中的玩家已离线。"
already-warming-up: "&c相关玩家已有一个正在预热的传送。"
warmup-start: "&e传送将在 {seconds} 秒后开始,请不要移动或受到伤害。"
warmup-status: "&e传送倒计时:{seconds} 秒"
warmup-cancelled-move: "&c传送已取消:你在预热期间移动了。"
warmup-cancelled-damage: "&c传送已取消:你在预热期间受到了伤害。"
teleport-complete: "&a传送完成。"
ignore-enabled: "&e你已开始忽略传送请求。"
ignore-disabled: "&a你已恢复接收传送请求。"
ignore-notification: "&7你当前正在忽略传送请求。"
tpaall-sent: "&a已向所有玩家发送传送请求。"
tpaall-no-targets: "&c没有可接收请求的在线玩家。"
blocks-menu: blocks-menu:
title: "&6&lEssentialsC &8- &e&l便捷菜单" title: "&6&lEssentialsC &8- &e&l便捷菜单"
@@ -169,3 +217,23 @@ mobdrops-menu:
name: "&d末影人掉落" name: "&d末影人掉落"
status: "&7当前状态:{status}" status: "&7当前状态:{status}"
toggle: "&e点击切换" toggle: "&e点击切换"
maintenance:
status:
enabled: "&c开启"
disabled: "&a关闭"
messages:
enabled: "&a维护模式已开启。"
disabled: "&c维护模式已关闭。"
reloaded: "&a维护模式配置已重载。"
status: "&7维护模式当前状态:{status} &8| &7白名单:&f{whitelist_count}"
usage: "&c用法:/maintenance <on|off|status|reload|add|remove|list>"
add-usage: "&c用法:/maintenance add <玩家|UUID>"
remove-usage: "&c用法:/maintenance remove <玩家|UUID>"
whitelist-added: "&a已将 {player} 加入维护白名单。"
whitelist-removed: "&a已将 {player} 移出维护白名单。"
whitelist-exists: "&e{player} 已在维护白名单中。"
whitelist-missing: "&c{player} 不在维护白名单中。"
whitelist-empty: "&7维护白名单为空。"
whitelist-list: "&7维护白名单({count}):&f{entries}"
login-blocked: "&e{player} 被维护模式拦截。&7UUID{uuid} &8| &7IP{address}"
+43
View File
@@ -0,0 +1,43 @@
# EssentialsC 维护模式配置
config-version: 1
# 是否开启维护模式。
enabled: false
# 拥有该权限的玩家可以在维护模式下进入服务器。
bypass-permission: "essentialsc.maintenance.bypass"
notify:
# 玩家因维护模式被拒绝进入时,是否通知在线管理员。
enabled: true
# 拥有该权限的在线玩家会收到拦截通知。
permission: "essentialsc.maintenance.notify"
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
+32
View File
@@ -0,0 +1,32 @@
# EssentialsC 模块配置
#
# modules.yml 用于控制功能模块是否在运行时加载。
# config.yml 仍然用于控制已启用模块内部的具体行为。
#
# 修改模块开关后可使用 /essc reload 刷新运行期服务和监听器。
# 直连命令的完整热增删仍建议通过重启服务器完成。
config-version: 1
modules:
blocks:
# 工作台、铁砧等便捷方块命令、/essc blocks 菜单和潜影盒快捷打开。
enabled: true
player:
# 玩家常用命令:飞行、夜视、发光、治疗、喂食、修复、帽子、自杀、隐身、查询玩家和 TPA。
enabled: true
admin-mode:
# /essc admin 管理模式,以及独立背包和状态管理。
enabled: true
tpsbar:
# 插件版 TPSBar。config.yml 中的 tpsbar.mode 仍会决定遇到原生 /tpsbar 时的行为。
enabled: true
jei-sync:
# Fabric / NeoForge JEI 配方同步兼容修复。
enabled: true
mob-drops:
# 末影人掉落控制菜单和监听器。默认关闭,用于保留过去标准版的行为。
enabled: false
maintenance:
# 维护模式。开启维护后可替换 MOTD,并阻止无绕过权限的玩家进入。
enabled: true
+48
View File
@@ -77,6 +77,30 @@ permissions:
essentialsc.command.repair.all: essentialsc.command.repair.all:
description: 允许使用 /repair all description: 允许使用 /repair all
default: op default: op
essentialsc.command.tpa:
description: 允许发送 /tpa 请求
default: true
essentialsc.command.tpahere:
description: 允许发送 /tpahere 请求
default: true
essentialsc.command.tpaall:
description: 允许向所有玩家发送 /tpahere 请求
default: op
essentialsc.command.tpaccept:
description: 允许接受 TPA 请求
default: true
essentialsc.command.tpdeny:
description: 允许拒绝 TPA 请求
default: true
essentialsc.command.tpignore:
description: 允许切换是否忽略 TPA 请求
default: true
essentialsc.tpa.bypass-warmup:
description: 允许绕过 TPA 传送预热
default: op
essentialsc.tpa.bypass-cooldown:
description: 允许绕过 TPA 冷却
default: op
essentialsc.command.admin: essentialsc.command.admin:
description: 允许使用 /essc admin description: 允许使用 /essc admin
default: op default: op
@@ -89,6 +113,18 @@ permissions:
essentialsc.command.tpsbar: essentialsc.command.tpsbar:
description: 允许使用 /tpsbar description: 允许使用 /tpsbar
default: op default: op
essentialsc.command.tpsbar.others:
description: 允许为其他玩家切换 /tpsbar
default: op
essentialsc.command.maintenance:
description: 允许管理维护模式
default: op
essentialsc.maintenance.bypass:
description: 允许在维护模式下进入服务器
default: op
essentialsc.maintenance.notify:
description: 允许接收维护模式拦截通知
default: op
essentialsc.shulkerbox.open: essentialsc.shulkerbox.open:
description: 允许通过 Shift+右键快捷打开潜影盒 description: 允许通过 Shift+右键快捷打开潜影盒
default: op default: op
@@ -121,9 +157,21 @@ permissions:
essentialsc.command.feed.others: true essentialsc.command.feed.others: true
essentialsc.command.repair: true essentialsc.command.repair: true
essentialsc.command.repair.all: true essentialsc.command.repair.all: true
essentialsc.command.tpa: true
essentialsc.command.tpahere: true
essentialsc.command.tpaall: true
essentialsc.command.tpaccept: true
essentialsc.command.tpdeny: true
essentialsc.command.tpignore: true
essentialsc.tpa.bypass-warmup: true
essentialsc.tpa.bypass-cooldown: true
essentialsc.command.admin: true essentialsc.command.admin: true
essentialsc.command.help: true essentialsc.command.help: true
essentialsc.command.reload: true essentialsc.command.reload: true
essentialsc.command.tpsbar: true essentialsc.command.tpsbar: true
essentialsc.command.tpsbar.others: true
essentialsc.command.maintenance: true
essentialsc.maintenance.bypass: true
essentialsc.maintenance.notify: true
essentialsc.shulkerbox.open: true essentialsc.shulkerbox.open: true
essentialsc.mobdrops.enderman: true essentialsc.mobdrops.enderman: true
+27
View File
@@ -0,0 +1,27 @@
plugins {
id 'java-library'
id 'io.papermc.paperweight.userdev'
}
repositories {
mavenCentral()
maven {
name = 'papermc'
url = uri('https://repo.papermc.io/repository/maven-public/')
}
}
dependencies {
api project(':compat-api')
paperweight.paperDevBundle('1.21.11-R0.1-SNAPSHOT')
}
java {
toolchain.languageVersion.set(JavaLanguageVersion.of(21))
}
paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.getMOJANG_PRODUCTION()
tasks.withType(JavaCompile).configureEach {
options.encoding = 'UTF-8'
}
@@ -0,0 +1,239 @@
package cn.infstar.essentialsC.v1_21_11.jei;
import cn.infstar.essentialsC.compat.jei.JeiRecipeSyncAdapter;
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 {
@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;
}
RecipeMap recipeMap = server.getRecipeManager().recipes;
if (debug) {
logger.info("开始构建 Fabric 配方数据");
}
var list = new ArrayList<FabricRecipeEntry>();
var seen = new HashSet<RecipeSerializer<?>>();
for (RecipeSerializer<?> serializer : BuiltInRegistries.RECIPE_SERIALIZER) {
if (!seen.add(serializer)) {
continue;
}
List<RecipeHolder<?>> recipes = new ArrayList<>();
for (RecipeHolder<?> holder : recipeMap.values()) {
if (holder.value().getSerializer() == serializer) {
recipes.add(holder);
}
}
if (!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());
getFabricCodec().encode(buffer, payload);
byte[] bytes = new byte[buffer.writerIndex()];
buffer.getBytes(0, bytes);
Identifier id = Identifier.fromNamespaceAndPath("fabric", "recipe_sync");
DiscardedPayload discardedPayload = new DiscardedPayload(id, bytes);
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;
}
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());
getNeoForgeStreamCodec().encode(buffer, payload);
byte[] bytes = new byte[buffer.writerIndex()];
buffer.getBytes(0, bytes);
Identifier id = Identifier.fromNamespaceAndPath("neoforge", "recipe_content");
DiscardedPayload discardedPayload = new DiscardedPayload(id, bytes);
serverPlayer.connection.send(new ClientboundCustomPayloadPacket(discardedPayload));
serverPlayer.connection.send(new net.minecraft.network.protocol.common.ClientboundUpdateTagsPacket(
net.minecraft.tags.TagNetworkSerialization.serializeTagsToNetwork(server.registries())
));
if (debug) {
logger.info("已发送 NeoForge 配方同步 [" + id + "], 大小: " + bytes.length + " bytes");
}
}
@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
) {
}
}
+27
View File
@@ -0,0 +1,27 @@
plugins {
id 'java-library'
id 'io.papermc.paperweight.userdev'
}
repositories {
mavenCentral()
maven {
name = 'papermc'
url = uri('https://repo.papermc.io/repository/maven-public/')
}
}
dependencies {
api project(':compat-api')
paperweight.paperDevBundle('26.1.2.build.72-stable')
}
java {
toolchain.languageVersion.set(JavaLanguageVersion.of(25))
}
paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.getMOJANG_PRODUCTION()
tasks.withType(JavaCompile).configureEach {
options.encoding = 'UTF-8'
}
@@ -0,0 +1,240 @@
package cn.infstar.essentialsC.v26_1_2.jei;
import cn.infstar.essentialsC.compat.jei.JeiRecipeSyncAdapter;
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 {
@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;
}
RecipeMap recipeMap = server.getRecipeManager().recipes;
if (debug) {
logger.info("开始构建 Fabric 配方数据");
}
var list = new ArrayList<FabricRecipeEntry>();
var seen = new HashSet<RecipeSerializer<?>>();
for (RecipeSerializer<?> serializer : BuiltInRegistries.RECIPE_SERIALIZER) {
if (!seen.add(serializer)) {
continue;
}
List<RecipeHolder<?>> recipes = new ArrayList<>();
for (RecipeHolder<?> holder : recipeMap.values()) {
if (holder.value().getSerializer() == serializer) {
recipes.add(holder);
}
}
if (!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());
getFabricCodec().encode(buffer, payload);
byte[] bytes = new byte[buffer.writerIndex()];
buffer.getBytes(0, bytes);
Identifier id = Identifier.fromNamespaceAndPath("fabric", "recipe_sync");
DiscardedPayload discardedPayload = new DiscardedPayload(id, bytes);
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;
}
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());
getNeoForgeStreamCodec().encode(buffer, payload);
byte[] bytes = new byte[buffer.writerIndex()];
buffer.getBytes(0, bytes);
Identifier id = Identifier.fromNamespaceAndPath("neoforge", "recipe_content");
DiscardedPayload discardedPayload = new DiscardedPayload(id, bytes);
serverPlayer.connection.send(new ClientboundCustomPayloadPacket(discardedPayload));
serverPlayer.connection.send(new net.minecraft.network.protocol.common.ClientboundUpdateTagsPacket(
net.minecraft.tags.TagNetworkSerialization.serializeTagsToNetwork(server.registries())
));
if (debug) {
logger.info("已发送 NeoForge 配方同步 [" + id + "], 大小: " + bytes.length + " bytes");
}
}
@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
) {
}
}
+27
View File
@@ -0,0 +1,27 @@
plugins {
id 'java-library'
id 'io.papermc.paperweight.userdev'
}
repositories {
mavenCentral()
maven {
name = 'papermc'
url = uri('https://repo.papermc.io/repository/maven-public/')
}
}
dependencies {
api project(':compat-api')
paperweight.paperDevBundle('26.2.build.31-alpha')
}
java {
toolchain.languageVersion.set(JavaLanguageVersion.of(25))
}
paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.getMOJANG_PRODUCTION()
tasks.withType(JavaCompile).configureEach {
options.encoding = 'UTF-8'
}
@@ -0,0 +1,240 @@
package cn.infstar.essentialsC.v26_2.jei;
import cn.infstar.essentialsC.compat.jei.JeiRecipeSyncAdapter;
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 {
@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;
}
RecipeMap recipeMap = server.getRecipeManager().recipes;
if (debug) {
logger.info("开始构建 Fabric 配方数据");
}
var list = new ArrayList<FabricRecipeEntry>();
var seen = new HashSet<RecipeSerializer<?>>();
for (RecipeSerializer<?> serializer : BuiltInRegistries.RECIPE_SERIALIZER) {
if (!seen.add(serializer)) {
continue;
}
List<RecipeHolder<?>> recipes = new ArrayList<>();
for (RecipeHolder<?> holder : recipeMap.values()) {
if (holder.value().getSerializer() == serializer) {
recipes.add(holder);
}
}
if (!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());
getFabricCodec().encode(buffer, payload);
byte[] bytes = new byte[buffer.writerIndex()];
buffer.getBytes(0, bytes);
Identifier id = Identifier.fromNamespaceAndPath("fabric", "recipe_sync");
DiscardedPayload discardedPayload = new DiscardedPayload(id, bytes);
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;
}
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());
getNeoForgeStreamCodec().encode(buffer, payload);
byte[] bytes = new byte[buffer.writerIndex()];
buffer.getBytes(0, bytes);
Identifier id = Identifier.fromNamespaceAndPath("neoforge", "recipe_content");
DiscardedPayload discardedPayload = new DiscardedPayload(id, bytes);
serverPlayer.connection.send(new ClientboundCustomPayloadPacket(discardedPayload));
serverPlayer.connection.send(new net.minecraft.network.protocol.common.ClientboundUpdateTagsPacket(
net.minecraft.tags.TagNetworkSerialization.serializeTagsToNetwork(server.registries())
));
if (debug) {
logger.info("已发送 NeoForge 配方同步 [" + id + "], 大小: " + bytes.length + " bytes");
}
}
@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
) {
}
}