Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 1 addition & 25 deletions .github/workflows/weekly-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 }}"}}'

3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ val printVersionInfo = tasks.register("printVersionInfo") {

tasks.named("assemble") {
dependsOn(collectPluginJars)
// 构建时自动生成 split 分发(主插件 + 各可选模块,含 backend-nanolimbo)。
// 构建时自动生成 split 分发(主插件 + 各可选模块)。
dependsOn(collectSplitPluginJars)
}

Expand Down
8 changes: 0 additions & 8 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Original file line number Diff line number Diff line change
Expand Up @@ -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`。监听地址的解析规则:
Expand Down
1 change: 0 additions & 1 deletion subplugin/backend-nanolimbo
Submodule backend-nanolimbo deleted from 816f09
2 changes: 0 additions & 2 deletions velocity/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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<ShadowJar>("relocateBstatsCompileOnlyJar") {
Expand Down
2 changes: 1 addition & 1 deletion velocity/src/main/resources/config-comments/en_us.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
2 changes: 1 addition & 1 deletion velocity/src/main/resources/config-comments/zh_cn.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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模式。"
Expand Down
Loading