From ad3364db0b7d70be4c65f9a1e7d032b6367e54ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E9=9B=A8=E8=90=BD?= Date: Wed, 11 Nov 2026 12:13:02 +0800 Subject: [PATCH] feat: remove nanolimbo. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 秋雨落 --- .github/workflows/weekly-release.yml | 26 +------------------ .gitmodules | 3 --- build.gradle.kts | 2 +- settings.gradle.kts | 8 ------ .../login/backend/hzlimbo/HzLimboSubModule.kt | 2 +- subplugin/backend-nanolimbo | 1 - velocity/build.gradle.kts | 2 -- .../main/resources/config-comments/en_us.conf | 2 +- .../main/resources/config-comments/zh_cn.conf | 2 +- 9 files changed, 5 insertions(+), 43 deletions(-) delete mode 100644 .gitmodules delete mode 160000 subplugin/backend-nanolimbo diff --git a/.github/workflows/weekly-release.yml b/.github/workflows/weekly-release.yml index e6709615..7e05c3ef 100644 --- a/.github/workflows/weekly-release.yml +++ b/.github/workflows/weekly-release.yml @@ -17,9 +17,6 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 - # backend-nanolimbo 是 HZL-nanolimbo submodule(其内部还有 NanoLimbo submodule); - # 它不嵌入 all-in-one,但会作为可选模块单独构建/发布。 - submodules: recursive - name: Set up JDK 25 uses: actions/setup-java@v4 @@ -95,29 +92,8 @@ jobs: This is an automatically generated weekly prerelease build for HyperZoneLogin. - All-in-one plugin (plugin + embedded modules + CLI) - - Split plugin and optional module jars (incl. `backend-nanolimbo`) + - Split plugin and optional module jars - VelocityCTD-flavored all-in-one plugin (only when the optional CTD build succeeds) - The optional `backend-nanolimbo` module is maintained in the separate - [HZL-nanolimbo](https://github.com/HyperZoneLogin/HZL-nanolimbo) repository and is not bundled - into the all-in-one jar. - If you encounter issues, please open an Issue and include environment, modules, logs, config snippets, and reproduction steps. generateReleaseNotes: true - - # 同步触发 HZL-nanolimbo 仓库的发布(可选;需要配置 HZL_NANOLIMBO_TOKEN)。 - - name: Dispatch HZL-nanolimbo release - continue-on-error: true - env: - TOKEN: ${{ secrets.HZL_NANOLIMBO_TOKEN }} - run: | - if [ -z "$TOKEN" ]; then - echo "HZL_NANOLIMBO_TOKEN 未配置,跳过 HZL-nanolimbo 同步发布。" - exit 0 - fi - curl -fsS -X POST \ - -H "Authorization: Bearer $TOKEN" \ - -H "Accept: application/vnd.github+json" \ - https://api.github.com/repos/HyperZoneLogin/HZL-nanolimbo/dispatches \ - -d '{"event_type":"hzl-weekly","client_payload":{"tag":"${{ steps.meta.outputs.tag }}"}}' - diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 55d06406..00000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "subplugin/backend-nanolimbo"] - path = subplugin/backend-nanolimbo - url = git@github.com:HyperZoneLogin/HZL-nanolimbo.git diff --git a/build.gradle.kts b/build.gradle.kts index 3ff2a5ca..42b09742 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -419,7 +419,7 @@ val printVersionInfo = tasks.register("printVersionInfo") { tasks.named("assemble") { dependsOn(collectPluginJars) - // 构建时自动生成 split 分发(主插件 + 各可选模块,含 backend-nanolimbo)。 + // 构建时自动生成 split 分发(主插件 + 各可选模块)。 dependsOn(collectSplitPluginJars) } diff --git a/settings.gradle.kts b/settings.gradle.kts index 9feabb87..6ef7904a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -55,11 +55,3 @@ include("subplugin:profile-skin") include("subplugin:helper-chatsession") include("subplugin:backend-hzlimbo") include("paper") - -// backend-nanolimbo 已拆分到独立仓库 HZL-nanolimbo,以 git submodule 形式放在 -// subplugin/backend-nanolimbo。检出时默认参与构建(作为可选模块,不嵌入 all-in-one); -// submodule 未初始化(目录为空)时自动跳过。 -val nanolimboDir = file("subplugin/backend-nanolimbo") -if (nanolimboDir.resolve("build.gradle.kts").isFile) { - include("subplugin:backend-nanolimbo") -} diff --git a/subplugin/backend-hzlimbo/src/main/kotlin/icu/h2l/login/backend/hzlimbo/HzLimboSubModule.kt b/subplugin/backend-hzlimbo/src/main/kotlin/icu/h2l/login/backend/hzlimbo/HzLimboSubModule.kt index d79ba13b..b1c15174 100644 --- a/subplugin/backend-hzlimbo/src/main/kotlin/icu/h2l/login/backend/hzlimbo/HzLimboSubModule.kt +++ b/subplugin/backend-hzlimbo/src/main/kotlin/icu/h2l/login/backend/hzlimbo/HzLimboSubModule.kt @@ -40,7 +40,7 @@ import java.nio.file.Files /** * 内置 HzLimbo 后端模块。 * - * 与 backend-nanolimbo 不同,本模块直接复用 Velocity 的网络栈(compileOnly velocity-proxy), + * 本模块直接复用 Velocity 的网络栈(compileOnly velocity-proxy), * 只实现 limbo 特有的连接状态机与固定数据下发;不做 infoForwarding。 * * 配置见 `backend-hzlimbo.conf`。监听地址的解析规则: diff --git a/subplugin/backend-nanolimbo b/subplugin/backend-nanolimbo deleted file mode 160000 index 816f095d..00000000 --- a/subplugin/backend-nanolimbo +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 816f095d07164a4a8e09305050882c0d11653463 diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts index b4310e92..e0f710c9 100644 --- a/velocity/build.gradle.kts +++ b/velocity/build.gradle.kts @@ -60,8 +60,6 @@ val embeddedModuleProjects = listOf( project(":subplugin:safe"), project(":subplugin:profile-skin"), project(":subplugin:helper-chatsession"), - // 注意:backend-nanolimbo 是可选模块,不嵌入 all-in-one(build/HZL); - // 它由 collectSplitPluginJars 单独收集。 ) val relocateBstatsCompileOnlyJar = tasks.register("relocateBstatsCompileOnlyJar") { diff --git a/velocity/src/main/resources/config-comments/en_us.conf b/velocity/src/main/resources/config-comments/en_us.conf index 5dd9193b..548093fc 100644 --- a/velocity/src/main/resources/config-comments/en_us.conf +++ b/velocity/src/main/resources/config-comments/en_us.conf @@ -59,7 +59,7 @@ "config.modules.profile-skin" = "Skin cache" "config.modules.data-merge" = "Data migration" "config.modules.helper-chat-session" = "CHAT_SESSION_UPDATE interception helper" -"config.modules.backend-nanolimbo" = "Embedded NanoLimbo backend; starts a local auth waiting server only when vServer.mode is outpre" +"config.modules.backend-hzlimbo" = "Embedded HzLimbo backend; a lightweight limbo that reuses Velocity's network stack (local backend for outpre)" # VServerConfig "config.vserver.mode" = "Login server mode: backend or outpre. outpre is recommended; use backend if issues arise." diff --git a/velocity/src/main/resources/config-comments/zh_cn.conf b/velocity/src/main/resources/config-comments/zh_cn.conf index 924d7763..b623e29b 100644 --- a/velocity/src/main/resources/config-comments/zh_cn.conf +++ b/velocity/src/main/resources/config-comments/zh_cn.conf @@ -59,7 +59,7 @@ "config.modules.profile-skin" = "皮肤缓存" "config.modules.data-merge" = "数据迁移" "config.modules.helper-chat-session" = "CHAT_SESSION_UPDATE 拦截助手" -"config.modules.backend-nanolimbo" = "内置 NanoLimbo 后端;仅在 vServer.mode 为 outpre 时用于拉起本地认证等待服" +"config.modules.backend-hzlimbo" = "内置 HzLimbo 后端;复用 Velocity 网络栈的轻量 limbo(outpre 本地后端)" # VServerConfig "config.vserver.mode" = "登录服实现模式:backend 或 outpre。推荐 outpre 模式,若有问题请使用backend模式。"