Repository navigation
feat(resources): 第一阶段资源瘦身与打包去重(Part of #383) - #402
Merged
Merged
Conversation
lombinaxmasson
requested changes
Nov 14, 2026
lombinaxmasson
left a comment
Collaborator
There was a problem hiding this comment.
铁砧原矿工作件仍需要非空覆盖层
位置:[MaterialAnvilRenderer.java:64]
这里整体删除了覆盖层绘制,但青金石、红石等材质仍保留有效的 blockraw_overlay.png。像素检查确认:底图有 76/256 个透明像素,覆盖层恰好补全这些位置。将对应碎矿放上铁砧后,工作件表面会出现透明缺口。
应恢复“覆盖层存在时绘制”的逻辑,缺失覆盖层时跳过。
Member
Author
|
已按审阅意见完成修复并推送(
本地复测结果
|
lombinaxmasson
approved these changes
Nov 14, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Part of #383, #401, #384, #400(第一阶段瘦身与去重落地;上述四项 issue 均仍有后续步骤,合并后请保持打开)。
变更概要
1. 构建打包与 PNG 无损元数据剥离(Part of #401)
build.gradle、core/build.gradle、gradle/platform-forge.gradle与gradle/platform-neoforge.gradle中配置includeEmptyDirs = false,在资源打包阶段剔除空目录条目。gradle/png-chunk.gradle(PngChunkFilter与:core:verifyPngFilter),在gradle/incremental-resources.gradle增量同步资源时仅保留IHDR、PLTE、tRNS、IDAT、IEND关键数据块,无损剥离元数据与异常iCCP块,并清理遗留的GIMP.txt。tools/resources/check_png_metadata.py与 CIVerify packaged resources严格门禁(.github/workflows/build.yml),同步更新tools/README.md、tools/resources/README.md与docs/。2. 传输方块占位虚拟化与死 JSON 清理(Part of #400)
SharedInventoryModelPack.emitTransportPlaceholders(...),在 aliases 之后为GTFluidPipes、GTItemPipes、GTWires、GTSignalWires、GTAxles及AddonPipeRegistration发射引用minecraft:block/stone的虚拟占位 blockstate / item model,移除PipeWireClientModels中未使用的AXLE_TEX。3. 材料图标收敛、流体模板外迁与覆盖板绘制修复(Part of #384)
textures/block/fluids/templates/,同步调整FluidTexturePolicy、FluidVisualPolicy与MaterialFluidVisuals。MaterialTextureSet.modeled()收敛至 35 个实际使用材质集(保留全量 41 个枚举常量兼容性),使MaterialIconDefinitions、MaterialIcons、BlockMaterialIcons、SmelteryModelHelper、坩埚/金属砧/工具渲染链路将layer1/_overlay视作可选。modeled()材质集被MaterialCoverRules使用的block/material_icons/<set>/foil.png。ArmRenderHelper新增findSprite,修复PanelCoverRenderer在_overlay贴图已清理时向 layer 1 绘制缺失贴图导致覆盖板发紫黑块的问题,并补充MaterialIconIntegrityTest(含coverDesignsShipTheirIconSprites)。体积对比(本地构建产物实测)
20,231,406 B(16,063条生成 JSON /28,465项验证资源 /12,228张 PNG 严格校验通过)20,297,425 B(15,739条生成 JSON /28,132项验证资源 /12,228张 PNG 严格校验通过)验证记录
python tools/validation/route.py check:通过python tools/comments/check_comment_refs.py --diff origin/master:0 失败./gradlew --no-daemon --stacktrace :core:verifyPngFilter :api:check :core:check :buildtools:check :minecraft:spotlessCheck:通过./gradlew --no-daemon --stacktrace :minecraft:1.20.1-forge:assemble :minecraft:1.20.1-forge:compileTestJava :minecraft:1.20.1-forge:spotlessCheck :minecraft:1.21.1-neoforge:assemble :minecraft:1.21.1-neoforge:compileTestJava :minecraft:1.21.1-neoforge:spotlessCheck:通过tools/resources/check_compact_model_json.py与tools/resources/check_png_metadata.py --strict(双平台 JAR 及处理后资源目录):0 异常./gradlew --no-daemon --stacktrace :minecraft:1.21.1-neoforge:runGameTestServer:113 required tests passed./gradlew --no-daemon --stacktrace :minecraft:1.20.1-forge:runGameTestServer:108 required tests passed40.741s,铝合金板等覆盖板、坩埚、浸洗锅与常规渲染通过