XFE Git
XFE Studio Git
Git 首页 全局搜索
XFE 主站 文档 NuGet

XFEServerManager

【Java】我的世界XFE服务器管理器

公开
关注 0 Fork 0 Star 0
返回拉取请求列表

dev:合并 9 个提交 #3

已合并 dev master
拉取请求已合并 源分支中的变更已经进入 master。

审查进度

此分支未设置最低批准数。

0 / 0

尚未指定审查人。

XFEstudio 2026-09-04 09:55

变更说明

XFEstudio/XFEServerManager:dev 合并到 master

提交记录

  • 合并拉取请求 #2:codex/economy-system:合并 6 个提交 (821ab5c) — XFE工作室室长
  • feat: add crash protection automation (a98b23d) — XFE工作室室长
  • feat: expand trigger economy and harden authentication (6fa3c00) — XFE工作室室长
  • 完善变量渲染与接口文档 (0f4f762) — XFE工作室室长
  • 变量系统升级:支持嵌套泛型与作用域配置 (4037068) — XFE工作室室长
  • 支持处罚理由与玩家可见消息分离 (1a199eb) — XFE工作室室长
  • 实现多货币经济系统及全流程集成 (e36946d) — XFE工作室室长
  • 完善触发器系统并新增可视化菜单 (1f5899b) — XFE工作室室长
  • 增强命令目录与触发器参数输入体验 (96bcda9) — XFE工作室室长

提交

此拉取请求包含的提交记录。

文件变更

点击行号左侧的加号可以留下行级 Review 评论。

123 个文件 +16125 -726
Modified README.md +20 -1
Modified README.zh-CN.md +9 -1
Added common/core/src/main/java/com/xfestudio/xfeservermanager/core/economy/CurrencyDefinition.java +76 -0
Added common/core/src/main/java/com/xfestudio/xfeservermanager/core/economy/EconomyAccount.java +34 -0
Added common/core/src/main/java/com/xfestudio/xfeservermanager/core/economy/EconomyAmounts.java +65 -0
Added common/core/src/main/java/com/xfestudio/xfeservermanager/core/economy/EconomyConflictException.java +8 -0
Added common/core/src/main/java/com/xfestudio/xfeservermanager/core/economy/EconomyTransaction.java +65 -0
Modified common/core/src/main/java/com/xfestudio/xfeservermanager/core/governance/moderation/ModerationCase.java +1 -0
Modified common/core/src/main/java/com/xfestudio/xfeservermanager/core/governance/moderation/ModerationLedger.java +33 -1
Modified common/core/src/main/java/com/xfestudio/xfeservermanager/core/governance/moderation/SanctionEntry.java +18 -6
Added common/core/src/main/java/com/xfestudio/xfeservermanager/core/menu/MenuDefinition.java +181 -0
Added common/core/src/main/java/com/xfestudio/xfeservermanager/core/menu/MenuImageAsset.java +39 -0
Modified common/core/src/main/java/com/xfestudio/xfeservermanager/core/trigger/TriggerActionTree.java +4 -21
Modified common/core/src/main/java/com/xfestudio/xfeservermanager/core/trigger/TriggerCatalog.java +202 -8
Modified common/core/src/main/java/com/xfestudio/xfeservermanager/core/trigger/TriggerCommandConfiguration.java +60 -11
Modified common/core/src/main/java/com/xfestudio/xfeservermanager/core/trigger/TriggerDefinition.java +73 -9
Modified common/core/src/main/java/com/xfestudio/xfeservermanager/core/trigger/TriggerEvaluator.java +32 -4
Added common/core/src/main/java/com/xfestudio/xfeservermanager/core/trigger/TriggerJsonValueParser.java +178 -0
Modified common/core/src/main/java/com/xfestudio/xfeservermanager/core/trigger/TriggerScriptCompiler.java +104 -21
Added common/core/src/main/java/com/xfestudio/xfeservermanager/core/trigger/TriggerValueTypes.java +382 -0
Modified common/core/src/main/java/com/xfestudio/xfeservermanager/core/trigger/TriggerVariableCatalog.java +135 -0
Modified common/infra/src/main/java/com/xfestudio/xfeservermanager/infra/ServerManagerRuntime.java +21 -0
Added common/infra/src/main/java/com/xfestudio/xfeservermanager/infra/config/CrashProtectionConfiguration.java +81 -0
Modified common/infra/src/main/java/com/xfestudio/xfeservermanager/infra/config/RichTextMessageValidator.java +1 -1
Modified common/infra/src/main/java/com/xfestudio/xfeservermanager/infra/config/ServerConfiguration.java +5 -2
Modified common/infra/src/main/java/com/xfestudio/xfeservermanager/infra/config/ServerConfigurationLoader.java +67 -3
Modified common/infra/src/main/java/com/xfestudio/xfeservermanager/infra/http/HttpApiServer.java +22 -1
Modified common/infra/src/main/java/com/xfestudio/xfeservermanager/infra/persistence/SqliteGovernanceStateRepository.java +11 -8
Added common/infra/src/main/java/com/xfestudio/xfeservermanager/infra/persistence/SqliteMenuRepository.java +370 -0
Modified common/infra/src/main/java/com/xfestudio/xfeservermanager/infra/persistence/SqliteTriggerRepository.java +13 -6
Modified common/infra/src/main/java/com/xfestudio/xfeservermanager/infra/security/AuthenticationService.java +32 -2
Modified common/infra/src/main/java/com/xfestudio/xfeservermanager/infra/security/Capability.java +4 -0
Modified common/infra/src/main/java/com/xfestudio/xfeservermanager/infra/security/Role.java +11 -3
Added common/infra/src/main/resources/db/migration/V008__menus.sql +35 -0
Added common/infra/src/main/resources/db/migration/V009__economy.sql +67 -0
Added common/infra/src/main/resources/db/migration/V010__moderation_messages.sql +1 -0
Modified common/infra/src/main/resources/db/migration/index.txt +3 -0
Added common/infra/src/test/java/com/xfestudio/xfeservermanager/infra/config/CrashProtectionConfigurationTest.java +38 -0
Modified common/infra/src/test/java/com/xfestudio/xfeservermanager/infra/config/RichTextMessageValidatorTest.java +16 -0
Modified common/infra/src/test/java/com/xfestudio/xfeservermanager/infra/config/ServerConfigurationLoaderTest.java +55 -2
Modified common/infra/src/test/java/com/xfestudio/xfeservermanager/infra/http/HttpApiServerSecurityTest.java +25 -1
Modified common/infra/src/test/java/com/xfestudio/xfeservermanager/infra/persistence/SqliteDatabaseTest.java +1 -1
Added common/infra/src/test/java/com/xfestudio/xfeservermanager/infra/persistence/SqliteEconomyRepositoryTest.java +132 -0
Modified common/infra/src/test/java/com/xfestudio/xfeservermanager/infra/persistence/SqliteGovernanceStateRepositoryTest.java +20 -0
Added common/infra/src/test/java/com/xfestudio/xfeservermanager/infra/persistence/SqliteMenuRepositoryTest.java +80 -0
Modified common/infra/src/test/java/com/xfestudio/xfeservermanager/infra/persistence/SqliteTriggerRepositoryTest.java +25 -6
Modified common/infra/src/test/java/com/xfestudio/xfeservermanager/infra/security/AuthenticationServiceTest.java +29 -0
Added common/testkit/src/test/java/com/xfestudio/xfeservermanager/core/economy/EconomyAmountsTest.java +34 -0
Modified common/testkit/src/test/java/com/xfestudio/xfeservermanager/core/governance/moderation/ModerationLedgerTest.java +21 -0
Added common/testkit/src/test/java/com/xfestudio/xfeservermanager/core/menu/MenuDefinitionTest.java +54 -0
Modified common/testkit/src/test/java/com/xfestudio/xfeservermanager/core/trigger/TriggerCommandConfigurationTest.java +43 -4
Modified common/testkit/src/test/java/com/xfestudio/xfeservermanager/core/trigger/TriggerEngineTest.java +164 -32
Added common/testkit/src/test/java/com/xfestudio/xfeservermanager/core/trigger/TriggerValueTypesTest.java +107 -0
Modified common/testkit/src/test/java/com/xfestudio/xfeservermanager/core/trigger/TriggerVariableCatalogTest.java +24 -0
Added docs/crash-protection.md +59 -0
Added docs/economy.md +38 -0
Modified docs/implementation-status.md +4 -2
Modified docs/security.md +1 -1
Modified docs/triggers.md +15 -2
Added platform/forge-1.20.1/src/main/java/com/xfestudio/xfeservermanager/platform/forge/ForgeSpawnPointBridge.java +39 -0
Added platform/forge-1.20.6/src/main/java/com/xfestudio/xfeservermanager/platform/forge/ForgeSpawnPointBridge.java +39 -0
Added platform/forge-1.21.1/src/main/java/com/xfestudio/xfeservermanager/platform/forge/ForgeSpawnPointBridge.java +39 -0
Added platform/forge-1.21.11/src/main/java/com/xfestudio/xfeservermanager/platform/forge/ForgeSpawnPointBridge.java +42 -0
Modified platform/forge-1.21.11/src/main/java/com/xfestudio/xfeservermanager/platform/forge/ModernForgeEvents.java +7 -3
Added platform/forge-1.21.11/src/main/java/com/xfestudio/xfeservermanager/platform/forge/client/ForgeMenuClientScreenModern.java +28 -0
Modified platform/shared/src/forge-common/java/com/xfestudio/xfeservermanager/platform/forge/ForgeCommandAdapter.java +8 -2
Added platform/shared/src/forge-common/java/com/xfestudio/xfeservermanager/platform/forge/ForgeCommandCatalog.java +325 -0
Modified platform/shared/src/forge-common/java/com/xfestudio/xfeservermanager/platform/forge/ForgeCommands.java +316 -5
Added platform/shared/src/forge-common/java/com/xfestudio/xfeservermanager/platform/forge/ForgeCrashProtectionService.java +420 -0
Added platform/shared/src/forge-common/java/com/xfestudio/xfeservermanager/platform/forge/ForgeEconomyService.java +205 -0
Modified platform/shared/src/forge-common/java/com/xfestudio/xfeservermanager/platform/forge/ForgeGovernanceService.java +108 -13
Modified platform/shared/src/forge-common/java/com/xfestudio/xfeservermanager/platform/forge/ForgeManagementRuntime.java +117 -2
Added platform/shared/src/forge-common/java/com/xfestudio/xfeservermanager/platform/forge/ForgeMenuService.java +257 -0
Modified platform/shared/src/forge-common/java/com/xfestudio/xfeservermanager/platform/forge/ForgeRichTextMessage.java +19 -4
Added platform/shared/src/forge-common/java/com/xfestudio/xfeservermanager/platform/forge/ForgeTriggerArgumentType.java +222 -0
Modified platform/shared/src/forge-common/java/com/xfestudio/xfeservermanager/platform/forge/ForgeTriggerCommandRegistry.java +169 -15
Modified platform/shared/src/forge-common/java/com/xfestudio/xfeservermanager/platform/forge/ForgeTriggerContexts.java +1 -0
Added platform/shared/src/forge-common/java/com/xfestudio/xfeservermanager/platform/forge/mixin/MenuChatComponentMixin.java +21 -0
Modified platform/shared/src/forge-common/java/com/xfestudio/xfeservermanager/platform/forge/mixin/XFEServerManagerMixinPlugin.java +18 -0
Modified platform/shared/src/forge-legacy/java/com/xfestudio/xfeservermanager/platform/forge/LegacyForgeEvents.java +9 -1
Added platform/shared/src/main/java/com/xfestudio/xfeservermanager/platform/bridge/CrashProtectionBridge.java +33 -0
Modified platform/shared/src/main/java/com/xfestudio/xfeservermanager/platform/bridge/PlatformServices.java +1 -0
Modified platform/shared/src/main/resources/xfeservermanager.mixins.json +3 -0
Added platform/shared/src/test/java/com/xfestudio/xfeservermanager/platform/forge/ForgeCommandCatalogTest.java +100 -0
Added platform/shared/src/test/java/com/xfestudio/xfeservermanager/platform/forge/ForgeEconomyServiceTest.java +41 -0
Modified platform/shared/src/test/java/com/xfestudio/xfeservermanager/platform/forge/ForgeGovernanceServiceTest.java +21 -0
Added platform/shared/src/test/java/com/xfestudio/xfeservermanager/platform/forge/ForgeMenuImagePreviewResolverTest.java +72 -0
Modified platform/shared/src/test/java/com/xfestudio/xfeservermanager/platform/forge/ForgeRichTextMessageTest.java +19 -0
Modified platform/shared/src/test/java/com/xfestudio/xfeservermanager/platform/forge/ForgeTriggerCommandRegistryTest.java +34 -0
Modified platform/shared/src/test/java/com/xfestudio/xfeservermanager/platform/forge/ForgeTriggerServiceTest.java +111 -4
Modified scripts/build-all.ps1 +3 -0
Modified web-ui/src/app.tsx +4 -0
Modified web-ui/src/components/app-shell.tsx +6 -2
Added web-ui/src/components/command-catalog-picker.tsx +207 -0
Modified web-ui/src/components/policy-rule-editor.tsx +55 -4
Modified web-ui/src/components/rich-text-editor.test.tsx +381 -4
Added web-ui/src/components/variable-catalog-picker.tsx +351 -0
Modified web-ui/src/lib/api.test.ts +15 -0
Modified web-ui/src/lib/api.ts +83 -1
Modified web-ui/src/lib/i18n.tsx +8 -0
Modified web-ui/src/lib/permissions.ts +6 -0
Added web-ui/src/pages/economy.test.tsx +105 -0
Added web-ui/src/pages/economy.tsx +374 -0
Added web-ui/src/pages/menus.test.tsx +99 -0
Modified web-ui/src/pages/messages.test.tsx +7 -0
Modified web-ui/src/pages/moderation.tsx +9 -4
Modified web-ui/src/pages/policies-editor.test.tsx +69 -1
Modified web-ui/src/pages/policies.tsx +11 -1
Modified web-ui/src/pages/settings-accounts.test.tsx +31 -0
Modified web-ui/src/pages/settings-auth.test.tsx +7 -0
Modified web-ui/src/pages/settings.tsx +88 -2
Modified web-ui/src/pages/triggers.test.tsx +347 -15
Modified web-ui/src/styles.css +269 -29
Modified web-ui/src/types.ts +245 -0