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

XFEServerManager

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

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

dev:合并 4 个提交 #1

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

审查进度

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

0 / 0

尚未指定审查人。

XFEstudio 2026-09-03 20:42

变更说明

XFEstudio/XFEServerManager:dev 合并到 master

提交记录

  • 实现XFEServerManager v2治理与维护前端支持 (125ac14) — XFE工作室室长
  • 统一类名为 XFEServerManagerForge (6c06ff5) — XFE工作室室长
  • Fix reobfuscated legacy command permissions (61c8666) — XFE工作室室长
  • Target Forge 47.4.0 for Minecraft 1.20.1 (99c694f) — XFE工作室室长

提交

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

文件变更

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

185 个文件 +20863 -685
Modified README.md +33 -10
Modified README.zh-CN.md +13 -6
Modified SECURITY.md +2 -2
Added build-all.cmd +4 -0
Added build-tools/loopback-agent/MANIFEST.MF +2 -0
Added build-tools/loopback-agent/src/com/xfestudio/xfeservermanager/tooling/ForceTcpLoopbackAgent.java +46 -0
Modified common/api/build.gradle +1 -1
Modified common/api/src/main/java/com/xfestudio/xfeservermanager/api/policy/PolicyRule.java +29 -1
Modified common/core/build.gradle +1 -1
Modified common/core/src/main/java/com/xfestudio/xfeservermanager/core/governance/claim/ClaimService.java +56 -1
Modified common/core/src/main/java/com/xfestudio/xfeservermanager/core/governance/maintenance/MaintenanceService.java +23 -3
Added common/core/src/main/java/com/xfestudio/xfeservermanager/core/governance/maintenance/MaintenanceStateRepositoryPort.java +22 -0
Added common/core/src/main/java/com/xfestudio/xfeservermanager/core/governance/moderation/ModerationCaseRepositoryPort.java +22 -0
Modified common/core/src/main/java/com/xfestudio/xfeservermanager/core/governance/moderation/ModerationLedger.java +35 -11
Modified common/core/src/main/java/com/xfestudio/xfeservermanager/core/player/PlayerInventoryService.java +9 -3
Modified common/core/src/main/java/com/xfestudio/xfeservermanager/core/policy/CommandPolicyEngine.java +1 -17
Modified common/core/src/main/java/com/xfestudio/xfeservermanager/core/policy/ConstraintEvaluator.java +11 -1
Deleted common/core/src/main/java/com/xfestudio/xfeservermanager/core/policy/OfflineModeCommandGuard.java +0 -48
Modified common/core/src/main/java/com/xfestudio/xfeservermanager/core/policy/PolicySnapshotFactory.java +36 -11
Modified common/core/src/main/java/com/xfestudio/xfeservermanager/core/policy/PolicyValidator.java +24 -0
Modified common/core/src/main/java/com/xfestudio/xfeservermanager/core/rollback/RollbackQuery.java +11 -0
Added common/core/src/main/java/com/xfestudio/xfeservermanager/core/trigger/TriggerActionTree.java +149 -0
Added common/core/src/main/java/com/xfestudio/xfeservermanager/core/trigger/TriggerCatalog.java +268 -0
Added common/core/src/main/java/com/xfestudio/xfeservermanager/core/trigger/TriggerCommandConfiguration.java +91 -0
Added common/core/src/main/java/com/xfestudio/xfeservermanager/core/trigger/TriggerDefinition.java +183 -0
Added common/core/src/main/java/com/xfestudio/xfeservermanager/core/trigger/TriggerEvaluator.java +378 -0
Added common/core/src/main/java/com/xfestudio/xfeservermanager/core/trigger/TriggerGroup.java +28 -0
Added common/core/src/main/java/com/xfestudio/xfeservermanager/core/trigger/TriggerGroupNotFoundException.java +20 -0
Added common/core/src/main/java/com/xfestudio/xfeservermanager/core/trigger/TriggerIntervalSchedule.java +144 -0
Added common/core/src/main/java/com/xfestudio/xfeservermanager/core/trigger/TriggerLimitExceededException.java +23 -0
Added common/core/src/main/java/com/xfestudio/xfeservermanager/core/trigger/TriggerNotFoundException.java +20 -0
Added common/core/src/main/java/com/xfestudio/xfeservermanager/core/trigger/TriggerRevisionConflictException.java +39 -0
Added common/core/src/main/java/com/xfestudio/xfeservermanager/core/trigger/TriggerScriptCompiler.java +201 -0
Added common/core/src/main/java/com/xfestudio/xfeservermanager/core/trigger/TriggerTimeContext.java +112 -0
Added common/core/src/main/java/com/xfestudio/xfeservermanager/core/trigger/TriggerVariableCatalog.java +405 -0
Modified common/infra/src/main/java/com/xfestudio/xfeservermanager/infra/ServerManagerRuntime.java +29 -3
Added common/infra/src/main/java/com/xfestudio/xfeservermanager/infra/config/RichTextMessageValidator.java +108 -0
Modified common/infra/src/main/java/com/xfestudio/xfeservermanager/infra/config/ServerConfiguration.java +70 -2
Modified common/infra/src/main/java/com/xfestudio/xfeservermanager/infra/config/ServerConfigurationLoader.java +45 -3
Modified common/infra/src/main/java/com/xfestudio/xfeservermanager/infra/http/HttpApiServer.java +179 -30
Modified common/infra/src/main/java/com/xfestudio/xfeservermanager/infra/http/ManagementGateway.java +5 -0
Modified common/infra/src/main/java/com/xfestudio/xfeservermanager/infra/persistence/SqliteEventStore.java +103 -15
Modified common/infra/src/main/java/com/xfestudio/xfeservermanager/infra/persistence/SqliteGovernanceStateRepository.java +173 -3
Modified common/infra/src/main/java/com/xfestudio/xfeservermanager/infra/security/AuthenticationService.java +14 -2
Modified common/infra/src/main/java/com/xfestudio/xfeservermanager/infra/security/Capability.java +2 -0
Modified common/infra/src/main/java/com/xfestudio/xfeservermanager/infra/security/Role.java +8 -3
Modified common/infra/src/main/java/com/xfestudio/xfeservermanager/infra/webhook/HmacWebhookEventSink.java +1 -1
Added common/infra/src/main/resources/db/migration/V006__player_join_notice_state.sql +9 -0
Added common/infra/src/main/resources/db/migration/V007__triggers.sql +46 -0
Modified common/infra/src/main/resources/db/migration/index.txt +2 -0
Modified common/infra/src/main/resources/web/index.html +2 -2
Added common/infra/src/test/java/com/xfestudio/xfeservermanager/infra/config/RichTextMessageValidatorTest.java +45 -0
Modified common/infra/src/test/java/com/xfestudio/xfeservermanager/infra/config/ServerConfigurationLoaderTest.java +41 -2
Modified common/infra/src/test/java/com/xfestudio/xfeservermanager/infra/http/HttpApiServerSecurityTest.java +35 -2
Modified common/infra/src/test/java/com/xfestudio/xfeservermanager/infra/persistence/SqliteDatabaseTest.java +1 -1
Modified common/infra/src/test/java/com/xfestudio/xfeservermanager/infra/persistence/SqliteEventStoreTest.java +38 -0
Modified common/infra/src/test/java/com/xfestudio/xfeservermanager/infra/persistence/SqliteGovernanceStateRepositoryTest.java +21 -0
Modified common/infra/src/test/java/com/xfestudio/xfeservermanager/infra/persistence/SqlitePolicyRepositoryTest.java +17 -0
Added common/infra/src/test/java/com/xfestudio/xfeservermanager/infra/persistence/TriggerActionJsonCompatibilityTest.java +45 -0
Modified common/infra/src/test/java/com/xfestudio/xfeservermanager/infra/security/AuthenticationServiceTest.java +24 -0
Modified common/testkit/build.gradle +1 -1
Modified common/testkit/src/test/java/com/xfestudio/xfeservermanager/core/governance/claim/ClaimServiceTest.java +18 -0
Modified common/testkit/src/test/java/com/xfestudio/xfeservermanager/core/policy/AtomicPolicyRepositoryTest.java +41 -0
Modified common/testkit/src/test/java/com/xfestudio/xfeservermanager/core/policy/CommandPolicyEngineTest.java +33 -6
Added common/testkit/src/test/java/com/xfestudio/xfeservermanager/core/trigger/TriggerCommandConfigurationTest.java +72 -0
Added common/testkit/src/test/java/com/xfestudio/xfeservermanager/core/trigger/TriggerEngineTest.java +489 -0
Added common/testkit/src/test/java/com/xfestudio/xfeservermanager/core/trigger/TriggerIntervalScheduleTest.java +120 -0
Added common/testkit/src/test/java/com/xfestudio/xfeservermanager/core/trigger/TriggerVariableCatalogTest.java +138 -0
Modified deploy/Caddyfile.example +1 -1
Modified deploy/nginx.conf.example +1 -1
Modified deploy/xfeservermanager.service.example +1 -1
Modified docs/architecture.md +8 -3
Modified docs/building.md +4 -5
Modified docs/compatibility.md +2 -2
Modified docs/deployment.md +3 -3
Modified docs/implementation-status.md +9 -6
Modified docs/security.md +7 -3
Added docs/triggers.md +180 -0
Modified gradle.properties +1 -1
Modified platform/forge-1.20.1/build.gradle +1 -1
Modified platform/forge-1.20.1/gradle.lockfile +98 -98
Modified platform/forge-1.20.1/gradle.properties +4 -4
Modified platform/forge-1.20.1/settings.gradle +1 -2
Added platform/forge-1.20.1/src/main/java/com/xfestudio/xfeservermanager/platform/forge/ForgeTickRateBridge.java +36 -0
Added platform/forge-1.20.1/src/main/java/com/xfestudio/xfeservermanager/platform/forge/ForgeWorldDataBridge.java +87 -0
Modified platform/forge-1.20.1/src/main/resources/pack.mcmeta +1 -1
Modified platform/forge-1.20.6/build.gradle +1 -1
Modified platform/forge-1.20.6/gradle.properties +2 -2
Modified platform/forge-1.20.6/settings.gradle +1 -2
Added platform/forge-1.20.6/src/main/java/com/xfestudio/xfeservermanager/platform/forge/ForgeTickRateBridge.java +31 -0
Added platform/forge-1.20.6/src/main/java/com/xfestudio/xfeservermanager/platform/forge/ForgeWorldDataBridge.java +85 -0
Modified platform/forge-1.20.6/src/main/resources/pack.mcmeta +1 -1
Modified platform/forge-1.21.1/build.gradle +1 -1
Modified platform/forge-1.21.1/gradle.properties +2 -2
Modified platform/forge-1.21.1/settings.gradle +1 -2
Added platform/forge-1.21.1/src/main/java/com/xfestudio/xfeservermanager/platform/forge/ForgeTickRateBridge.java +31 -0
Added platform/forge-1.21.1/src/main/java/com/xfestudio/xfeservermanager/platform/forge/ForgeWorldDataBridge.java +85 -0
Modified platform/forge-1.21.1/src/main/resources/pack.mcmeta +1 -1
Modified platform/forge-1.21.11/build.gradle +1 -1
Modified platform/forge-1.21.11/gradle.properties +2 -2
Modified platform/forge-1.21.11/settings.gradle +1 -2
Added platform/forge-1.21.11/src/main/java/com/xfestudio/xfeservermanager/platform/forge/ForgeRichTextEvents.java +28 -0
Added platform/forge-1.21.11/src/main/java/com/xfestudio/xfeservermanager/platform/forge/ForgeTickRateBridge.java +31 -0
Added platform/forge-1.21.11/src/main/java/com/xfestudio/xfeservermanager/platform/forge/ForgeWorldDataBridge.java +93 -0
Renamed platform/forge-1.21.11/src/main/java/com/xfestudio/xfeservermanager/platform/forge/XFEServerManagerForge.java +4 -4
Modified platform/forge-1.21.11/src/main/resources/pack.mcmeta +1 -1
Modified platform/shared/forge-common.gradle +15 -1
Modified platform/shared/src/forge-common/java/com/xfestudio/xfeservermanager/platform/forge/ForgeCommandAdapter.java +12 -0
Modified platform/shared/src/forge-common/java/com/xfestudio/xfeservermanager/platform/forge/ForgeCommands.java +110 -46
Added platform/shared/src/forge-common/java/com/xfestudio/xfeservermanager/platform/forge/ForgeLocalization.java +95 -0
Modified platform/shared/src/forge-common/java/com/xfestudio/xfeservermanager/platform/forge/ForgeManagementRuntime.java +129 -4
Modified platform/shared/src/forge-common/java/com/xfestudio/xfeservermanager/platform/forge/ForgePermissionCompat.java +17 -7
Modified platform/shared/src/forge-common/java/com/xfestudio/xfeservermanager/platform/forge/ForgePlayerOperations.java +45 -17
Added platform/shared/src/forge-common/java/com/xfestudio/xfeservermanager/platform/forge/ForgeRichTextMessage.java +250 -0
Added platform/shared/src/forge-common/java/com/xfestudio/xfeservermanager/platform/forge/ForgeTriggerCommandRegistry.java +211 -0
Added platform/shared/src/forge-common/java/com/xfestudio/xfeservermanager/platform/forge/ForgeTriggerContexts.java +92 -0
Added platform/shared/src/forge-common/java/com/xfestudio/xfeservermanager/platform/forge/ForgeWorldAccess.java +110 -0
Added platform/shared/src/forge-common/java/com/xfestudio/xfeservermanager/platform/forge/ForgeWorldStateCodec.java +183 -0
Added platform/shared/src/forge-common/java/com/xfestudio/xfeservermanager/platform/forge/LegacyTickRateController.java +35 -0
Added platform/shared/src/forge-common/java/com/xfestudio/xfeservermanager/platform/forge/mixin/BaseContainerBlockEntityMixin.java +59 -0
Added platform/shared/src/forge-common/java/com/xfestudio/xfeservermanager/platform/forge/mixin/LegacyMinecraftServerTickRateMixin.java +20 -0
Added platform/shared/src/forge-common/java/com/xfestudio/xfeservermanager/platform/forge/mixin/LegacyServerFunctionPauseMixin.java +17 -0
Added platform/shared/src/forge-common/java/com/xfestudio/xfeservermanager/platform/forge/mixin/LegacyServerLevelPauseMixin.java +19 -0
Added platform/shared/src/forge-common/java/com/xfestudio/xfeservermanager/platform/forge/mixin/XFEServerManagerMixinPlugin.java +48 -0
Added platform/shared/src/forge-legacy/java/com/xfestudio/xfeservermanager/platform/forge/ForgeRichTextEvents.java +28 -0
Added platform/shared/src/forge-legacy/java/com/xfestudio/xfeservermanager/platform/forge/LegacyForgePermissionBridge.java +17 -0
Renamed platform/shared/src/forge-legacy/java/com/xfestudio/xfeservermanager/platform/forge/XFEServerManagerForge.java +4 -4
Modified platform/shared/src/main/java/com/xfestudio/xfeservermanager/platform/bridge/BuildMetadata.java +2 -2
Modified platform/shared/src/main/resources/META-INF/mods.toml +4 -1
Modified platform/shared/src/main/resources/assets/xfeservermanager/lang/en_us.json +1 -2
Modified platform/shared/src/main/resources/assets/xfeservermanager/lang/zh_cn.json +1 -2
Added platform/shared/src/main/resources/xfeservermanager.mixins.json +16 -0
Added platform/shared/src/main/resources/xfeservermanager.png +0 -0
二进制文件已变更,无法进行逐行预览。
Added platform/shared/src/test/java/com/xfestudio/xfeservermanager/platform/forge/ForgeGovernanceServiceTest.java +19 -0
Added platform/shared/src/test/java/com/xfestudio/xfeservermanager/platform/forge/ForgeLocalizationTest.java +27 -0
Added platform/shared/src/test/java/com/xfestudio/xfeservermanager/platform/forge/ForgePermissionCompatTest.java +20 -0
Added platform/shared/src/test/java/com/xfestudio/xfeservermanager/platform/forge/ForgeRichTextMessageTest.java +127 -0
Added platform/shared/src/test/java/com/xfestudio/xfeservermanager/platform/forge/ForgeTriggerCommandRegistryTest.java +136 -0
Added platform/shared/src/test/java/com/xfestudio/xfeservermanager/platform/forge/ForgeTriggerServiceTest.java +316 -0
Modified scripts/build-all.ps1 +393 -76
Modified scripts/verify-wrappers.ps1 +16 -1
Modified settings.gradle +1 -2
Modified web-ui/README.md +1 -1
Modified web-ui/index.html +2 -2
Modified web-ui/package-lock.json +325 -2
Modified web-ui/package.json +2 -0
Modified web-ui/src/app.tsx +5 -1
Modified web-ui/src/components/app-shell.tsx +7 -2
Added web-ui/src/components/modal-portal.tsx +8 -0
Added web-ui/src/components/policy-rule-editor.tsx +205 -0
Added web-ui/src/components/rich-text-editor.test.tsx +408 -0
Added web-ui/src/components/rich-text-variables.ts +86 -0
Added web-ui/src/components/ui.test.tsx +38 -0
Modified web-ui/src/components/ui.tsx +57 -8
Modified web-ui/src/context/server-context.tsx +86 -1
Modified web-ui/src/lib/api.test.ts +122 -1
Modified web-ui/src/lib/api.ts +191 -12
Modified web-ui/src/lib/i18n.tsx +156 -6
Modified web-ui/src/lib/permissions.ts +4 -0
Modified web-ui/src/pages/claims.tsx +81 -8
Added web-ui/src/pages/maintenance.tsx +68 -0
Added web-ui/src/pages/messages.test.tsx +245 -0
Added web-ui/src/pages/messages.tsx +142 -0
Modified web-ui/src/pages/moderation.tsx +16 -3
Modified web-ui/src/pages/players-preview.test.tsx +1 -0
Modified web-ui/src/pages/players.tsx +3 -2
Modified web-ui/src/pages/policies-editor.test.tsx +25 -13
Modified web-ui/src/pages/policies.tsx +40 -17
Modified web-ui/src/pages/rollback.tsx +26 -3
Modified web-ui/src/pages/settings-accounts.test.tsx +91 -3
Modified web-ui/src/pages/settings-auth.test.tsx +19 -9
Modified web-ui/src/pages/settings.tsx +213 -15
Modified web-ui/src/styles.css +293 -10
Modified web-ui/src/types.ts +213 -3