Skip to content

Forge 1.20.1:修正模具分组、告警限流并清理 / Mold grouping, log limits and cleanup - #5

Open
AyaYumi wants to merge 3 commits into
21i0:1.20.1from
AyaYumi:codex/forge-1.20.1-recipe-cleanup
Open

AyaYumi wants to merge 3 commits into
21i0:1.20.1from
AyaYumi:codex/forge-1.20.1-recipe-cleanup

Conversation

@AyaYumi

@AyaYumi AyaYumi commented Oct 25, 2026 •

Copy link
Copy Markdown

中文

改动

  • 基于最新上游 1.20.1,承接已合并的 Forge 1.20.1: align Mekanism pins and quiet capsule diagnostics #4;保留上游 20.1.6.3 版本、官方本体 20.2.4.7 默认构建依赖及世界级配置说明。
  • 模具目录和 UI 按模具物品注册 namespace 分组、去重并升级缓存指纹;AppMek 转换的 Mekanism 机器归入 Mekanism,但不改动真实配方 source/identity。同步更新上游整包检查的分组断言。
  • 新增附属本地、线程安全且有容量上限的告警限流器:同一 logger/级别/消息模板每分钟至多一次,不因配方 ID 等参数变化绕过限制;保留首次真实异常与异常参数,不依赖本体新增 API。
  • 移除胶囊环境、阶段进度、耗时等调试输出;网络失败回复、任务状态、时间/内存预算、检查点与恢复逻辑保持不变,真实失败仍有受限告警。
  • 删除非必要审计、交接、更新文档和预览工具;将必要资源生成/发布检查工具移至 tools/,素材来源保留在第三方声明中。不添加新的 CHANGELOG 或临时报告。本轮合并 README 中重复的构建说明,保留默认官方 20.2.4.7、显式 20.2.4.9 开发包及离线仓库三种说明;日志复核未发现新增刷屏点。

验证

  • 本轮提交 aa47e113 的 GitHub Actions build 已通过。
  • Java 17,默认官方本体 20.2.4.7:./gradlew test --rerun build --offline --max-workers=1 通过,16 项 JUnit 全部通过。
  • 使用本体 20.2.4.9 的 build/devlibs 包显式覆盖后,离线普通构建及同一组 16 项测试再次通过。
  • compileJava -PcapsuleChecks -PstaffCompatChecks -PstaffPackChecks 编译通过;本次没有重新运行这些真实世界场景。
  • python tools/audit_forge_release.py build/libs/useless_stretcher-20.1.6.3.jar 通过:生产源码/资源完整,测试及外部 class 泄漏均为零。
  • 65 个 JSON 及 11 个本地模型贴图引用检查通过;保留剧情、动态玩偶资源、游戏内指南及素材授权。测试中间文件已清理。
  • 前序 Sky Edition 联合隐藏客户端回归已验证 Mekanism 27 种模具/3,147 条配方及新增模具获取;不是清理后重新进行全整包穷举。

范围

保持既有功能和配方语义,不把日志安静或目录数量当作兼容通过。ATM9 的 Thermal、龙研及两端配方身份问题仍属本体待修范围。此次仅更新已有 PR,未改动整合包或存档,不合并 PR、不发布 Release、不移动标签、不部署整包。

English

Changes

  • Build on the latest upstream 1.20.1 after merged PR Forge 1.20.1: align Mekanism pins and quiet capsule diagnostics #4. Retain upstream version 20.1.6.3, the default official base-mod 20.2.4.7 dependency and world-scoped configuration guidance.
  • Group/deduplicate catalog and UI molds by their registered item namespace and invalidate the old directory fingerprint. AppMek-converted Mekanism machines appear under Mekanism without changing actual recipe source/identity. Align the upstream pack-check assertions with this grouping.
  • Add an addon-local, thread-safe, bounded warning limiter: at most once per minute per logger/severity/message template. Changing recipe IDs or other arguments cannot bypass it; the first real exception and its arguments are preserved. No new base-mod API is required.
  • Remove capsule environment, progress and timing diagnostics while preserving network failure replies, task state, time/memory budgets, checkpoints and resume behavior. Real failures retain rate-limited warnings.
  • Remove nonessential audit/handoff/update documents and preview tooling. Move necessary asset-generation/release-check tools to tools/ and retain asset attribution in third-party notices. Add no new CHANGELOG or temporary reports. This update consolidates duplicate README build instructions while retaining the official 20.2.4.7 default, explicit 20.2.4.9 development-jar override and offline repository guidance. The logging re-audit found no additional spam sites.

Validation

  • GitHub Actions build passed for this update (aa47e113).
  • Java 17, default official base mod 20.2.4.7: ./gradlew test --rerun build --offline --max-workers=1 passed with all 16 JUnit tests.
  • The offline normal build and the same 16 tests also passed with an explicit override to the base mod 20.2.4.9 development jar from build/devlibs.
  • compileJava -PcapsuleChecks -PstaffCompatChecks -PstaffPackChecks passed compilation; these real-world scenarios were not rerun in this submission.
  • python tools/audit_forge_release.py build/libs/useless_stretcher-20.1.6.3.jar passed: complete production sources/resources, zero verification entries and zero foreign classes.
  • Resource checks passed for 65 JSON files and 11 local model-texture references. Preserve story/dynamic doll assets, in-game guides and attribution; remove generated testing intermediates.
  • Earlier joint hidden-client Sky Edition regression verified 27 Mekanism molds / 3,147 recipes and new mold fetching. This is not a new exhaustive full-pack runtime pass after cleanup.

Scope

Preserve existing functionality and recipe semantics. Quiet logs and catalog counts are not compatibility proof. ATM9 Thermal, Draconic and client/server recipe-identity issues remain outstanding in the base mod. This update only refreshes the existing PR and does not modify modpacks/saves, merge PRs, publish Releases, move tags or deploy into modpacks.

合并方式 / Merge method

当前最终内容已在上游合并提交中解决冲突,普通 Merge / Squash 可用。自动 Rebase 会逐个重放旧清理提交,与上游对 README、交接/更新文档及 docs 工具路径的修改冲突。本次保留历史正常推送,不强推、不代为合并。

The upstream merge already resolves the final tree, so normal Merge / Squash is available. Automatic Rebase instead replays earlier cleanup against upstream README, handoff/update-document and docs/tool-path changes and conflicts. History is preserved with a normal push; no force push or PR merge is performed.

关联 / Related

配套本体 PR / Companion base-mod PR: SorrowMist/UselessMod#54

@AyaYumi AyaYumi changed the title Forge 1.20.1:修正模具分组与告警限流 / Mold grouping and log cleanup Forge 1.20.1:修正模具分组、告警限流并清理 / Mold grouping, log limits and cleanup Oct 25, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant