Skip to content

fix(worldgen): fix high-altitude stone layer scan and surface rock placement - #395

Merged
Tanimodori merged 4 commits into
masterfrom
fix/issue-259-surface-rocks
Nov 14, 2026
Merged

Tanimodori merged 4 commits into
masterfrom
fix/issue-259-surface-rocks

Conversation

@Tanimodori

Copy link
Copy Markdown
Member

类型:bug,parity,scope: worldgen

关联:Refs #259,Refs #389(保持 #259 与 #389 打开)

阶段定位:本 PR 属于「矿物与岩层生成系统重构」(#388 / Phase 1)中的最小初步可玩性修复,仅先解决最影响探索找矿与高海拔地形的关键地表石子生成/追踪问题;整体岩层算法、负 Y 深层、矿脉形态、石子外观辨识、指示花与流体泉草方块等仍需后续继续修复。

改动摘要

  1. 抽离岩层扫描与地表石子纯规则到 core
    • 新增 StoneLayerScan:封装 7 格滑动窗口(y - 3 .. y + 3)与基于区块最高填充段的 maxScanY(...) 上界计算(最高填充段顶部再向上延伸 1 格并钳位到 maxBuildHeight - 1,避免恰好位于区块段边界如 Y=63/Y=143 的地表漏放石子)。
    • 新增 SurfaceRockRules:封装每列 lastRock / lastOre / canPlaceRocks 状态机、1/128 概率抽取与 nextBoolean() && lastOre != null 目标粉碎材料回退规则。
    • 新增 StoneLayerScanTest(5 条)与 SurfaceRockRulesTest(7 条)锁定边界与状态转换。
  2. 修复 GTStoneLayerFeature 高海拔与模组岩石连续性
    • 移除固定 MAX_GEN_Y = 144 上限,改为按 ChunkAccess#getHighestFilledSectionIndex() 动态计算每区块扫描上界,并在整个垂直范围内持续滑动 StoneLayerScan。
    • 移植 lastReplaced(对应原版 GT6 tLastReplaced),将 Blocks.INFESTED_STONE 与 BlockTags.BASE_STONE_OVERWORLD 纳入可替换岩石识别与连续追踪(GTStoneBlock 仍在前置分支独立处理)。
    • 自然 GTStoneBlock(STONE/COBBLE/COBBLE_MOSSY)仅维持 canPlaceRocks,不再改写 lastRock。
  3. 统一地表石子可替换位置校验
    • GTRocksFeature.replaceable(...) 补充 BlockTags.LEAVES、Blocks.FIRE、Blocks.SOUL_FIRE;GTRocksFeature.castRay(...) 与 GTRockPlacement.placeRock(...) 共用该可替换谓词及非流体检查,并拒绝以树叶作为支撑方块。
  4. 登记特殊石子差异文档
    • 在 docs/decisions/parity/worldgen.md 登记 MeteoricIron 散落分支随材料停注移除(保留 1/2 空与 1/2 燧石)。

明确不包含与后续仍需修复项

验证结果

  • python tools/comments/check_comment_refs.py --diff origin/master:0 failure(s), 0 symbol warning(s), 0 data-table finding(s)
  • .\gradlew.bat spotlessCheck :core:test compileBothPlatforms:BUILD SUCCESSFUL(38 suites,188 tests,0 skipped,0 failures,0 errors;含 StoneLayerScanTest 5/5、SurfaceRockRulesTest 7/7、GTStoneLayersGenTest 1/1;Forge 1.20.1 与 NeoForge 1.21.1 编译均通过)
  • git diff --check:无空白错误
  • 游戏内人工测试(1.21.1-neoforge):已在 Y=160 高海拔山地实机确认含油页岩 GT 岩层与对应指示石子正常生成(1.20.1-forge 未实机运行;模组石/水体/雪叶边界仅以单元测试与静态规则核对为主)

关联

@Tanimodori Tanimodori added bug 缺陷总类 / Bug umbrella parity 与 1.7.10 原版 GT6 行为不一致 / Differs from original GT6 on 1.7.10 scope: worldgen 矿脉、矿层、地表沉积、结构、群系与维度生成 / Ore veins, layers, deposits, structures, biomes, dimensions labels Nov 14, 2026
@Tanimodori Tanimodori self-assigned this Nov 14, 2026
@Tanimodori
Tanimodori force-pushed the fix/issue-259-surface-rocks branch from 6c973b3 to a1bee1d Compare November 14, 2026 02:30
@Tanimodori
Tanimodori merged commit d73b33d into master Nov 14, 2026
4 checks passed
@Tanimodori
Tanimodori deleted the fix/issue-259-surface-rocks branch November 14, 2026 15:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug 缺陷总类 / Bug umbrella parity 与 1.7.10 原版 GT6 行为不一致 / Differs from original GT6 on 1.7.10 scope: worldgen 矿脉、矿层、地表沉积、结构、群系与维度生成 / Ore veins, layers, deposits, structures, biomes, dimensions

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants