Skip to content

new-thin-air 与原版撞key修复#4503

Merged
SlimeSB merged 1 commit intoCFPAOrg:mainfrom
SlimeSB:water-breath
Jul 19, 2024
Merged

new-thin-air 与原版撞key修复#4503
SlimeSB merged 1 commit intoCFPAOrg:mainfrom
SlimeSB:water-breath

Conversation

@SlimeSB
Copy link
Copy Markdown
Collaborator

@SlimeSB SlimeSB commented Jul 14, 2024

总之先给他注释掉,以免影响太多

@boring-cyborg boring-cyborg Bot added 1.20.x Minecraft 版本标签 Forge 包含 Forge 模组 labels Jul 14, 2024
@cfpa-bot cfpa-bot Bot added the 10+ 行数标签 label Jul 14, 2024
@cfpa-bot
Copy link
Copy Markdown
Contributor

cfpa-bot Bot commented Jul 14, 2024

模组 🔗 链接 🎨 相关文件
Thin Air [Forge & Fabric] 🔍 源代码   | 🟩 MCMOD | 📁 对比(Azusa)
最新模组文件1.20.4/ThinAir-v20.4.2-1.20.4-NeoForge
1.20.4/ThinAir-v20.4.2-1.20.4-Forge
1.20.4/ThinAir-v20.4.2-1.20.4-Fabric
1.20.4/ThinAir-v20.4.1-1.20.4-NeoForge
1.20.4/ThinAir-v20.4.1-1.20.4-Forge
1.20.4/ThinAir-v20.4.1-1.20.4-Fabric
1.20.4/ThinAir-v20.4.0-1.20.4-Forge
1.20.4/ThinAir-v20.4.0-1.20.4-NeoForge
1.20.4/ThinAir-v20.4.0-1.20.4-Fabric
1.20.1/ThinAir-v8.1.5-1.20.1-Fabric
1.20.1/ThinAir-v8.1.5-1.20.1-Forge
1.20.1/ThinAir-v8.1.3-1.20.1-Fabric
1.20.1/ThinAir-v8.1.3-1.20.1-Forge
1.20.1/ThinAir-v8.1.3-1.20.1-Fabric
1.20.1/ThinAir-v8.1.3-1.20.1-Forge
1.20.1/ThinAir-v8.1.2-1.20.1-Fabric
1.20.1/ThinAir-v8.1.2-1.20.1-Forge
1.20.1/ThinAir-v8.1.1-1.20.1-Forge
1.20.1/ThinAir-v8.1.1-1.20.1-Fabric
1.20.1/ThinAir-v8.1.0-1.20.1-Fabric
1.20.1/ThinAir-v8.1.0-1.20.1-Forge
1.20.1/ThinAir-v8.0.0-1.20.1-Fabric
1.20.1/ThinAir-v8.0.0-1.20.1-Forge
语言文件链接1.19/zh_cn.json
1.19/en_us.json
1.20/zh_cn.json
1.20/en_us.json
依赖-Puzzles Lib [Forge & Fabric] 🔍 源代码   | 🟩 MCMOD |   *
最新模组文件1.20.4/PuzzlesLib-v20.4.52-1.20.4-NeoForge
1.20.4/PuzzlesLib-v20.4.52-1.20.4-Forge
1.20.4/PuzzlesLib-v20.4.52-1.20.4-Fabric
1.20.4/PuzzlesLib-v20.4.44-1.20.4-Forge
1.20.4/PuzzlesLib-v20.4.44-1.20.4-NeoForge
1.20.4/PuzzlesLib-v20.4.44-1.20.4-Fabric
1.20.4/PuzzlesLib-v20.4.43-1.20.4-Forge
1.20.4/PuzzlesLib-v20.4.43-1.20.4-NeoForge
1.20.4/PuzzlesLib-v20.4.43-1.20.4-Fabric
1.20.4/PuzzlesLib-v20.4.42-1.20.4-NeoForge
1.20.4/PuzzlesLib-v20.4.42-1.20.4-Forge
1.20.4/PuzzlesLib-v20.4.42-1.20.4-Fabric
1.20.4/PuzzlesLib-v20.4.41-1.20.4-Forge
1.20.4/PuzzlesLib-v20.4.41-1.20.4-NeoForge
1.20.4/PuzzlesLib-v20.4.41-1.20.4-Fabric
1.20.4/PuzzlesLib-v20.4.40-1.20.4-NeoForge
1.20.4/PuzzlesLib-v20.4.40-1.20.4-Forge
1.20.4/PuzzlesLib-v20.4.40-1.20.4-Fabric
1.20.4/PuzzlesLib-v20.4.39-1.20.4-NeoForge
1.20.4/PuzzlesLib-v20.4.39-1.20.4-Fabric
1.20.4/PuzzlesLib-v20.4.39-1.20.4-Forge
1.20.4/PuzzlesLib-v20.4.36-1.20.4-NeoForge
1.20.4/PuzzlesLib-v20.4.36-1.20.4-Forge
1.20.4/PuzzlesLib-v20.4.36-1.20.4-Fabric
1.20.4/PuzzlesLib-v20.4.31-1.20.4-NeoForge
1.20.4/PuzzlesLib-v20.4.31-1.20.4-Forge
1.20.4/PuzzlesLib-v20.4.31-1.20.4-Fabric
1.20.4/PuzzlesLib-v20.4.30-1.20.4-NeoForge
1.20.4/PuzzlesLib-v20.4.30-1.20.4-Forge
1.20.4/PuzzlesLib-v20.4.30-1.20.4-Fabric
1.20.4/PuzzlesLib-v20.4.25-1.20.4-NeoForge
1.20.4/PuzzlesLib-v20.4.25-1.20.4-Forge
1.20.4/PuzzlesLib-v20.4.25-1.20.4-Fabric
1.20.4/PuzzlesLib-v20.4.24-1.20.4-NeoForge
1.20.4/PuzzlesLib-v20.4.24-1.20.4-Forge
1.20.4/PuzzlesLib-v20.4.24-1.20.4-Fabric
1.20.4/PuzzlesLib-v20.4.23-1.20.4-NeoForge
1.20.4/PuzzlesLib-v20.4.23-1.20.4-Forge
1.20.4/PuzzlesLib-v20.4.23-1.20.4-Fabric
1.20.4/PuzzlesLib-v20.4.22-1.20.4-Forge
1.20.4/PuzzlesLib-v20.4.22-1.20.4-NeoForge
1.20.4/PuzzlesLib-v20.4.22-1.20.4-Fabric
1.20.4/PuzzlesLib-v20.4.21-1.20.4-NeoForge
1.20.4/PuzzlesLib-v20.4.21-1.20.4-Forge
1.20.4/PuzzlesLib-v20.4.21-1.20.4-Fabric
1.20.4/PuzzlesLib-v20.4.18-1.20.4-Forge
1.20.4/PuzzlesLib-v20.4.18-1.20.4-NeoForge
1.20.4/PuzzlesLib-v20.4.18-1.20.4-Fabric
1.20.4/PuzzlesLib-v20.4.17-1.20.4-Forge
1.20.4/PuzzlesLib-v20.4.17-1.20.4-NeoForge
1.20.4/PuzzlesLib-v20.4.17-1.20.4-Fabric
1.20.4/PuzzlesLib-v20.4.16-1.20.4-Forge
1.20.4/PuzzlesLib-v20.4.16-1.20.4-NeoForge
1.20.4/PuzzlesLib-v20.4.16-1.20.4-Fabric
1.20.4/PuzzlesLib-v20.4.15-1.20.4-Forge
1.20.4/PuzzlesLib-v20.4.15-1.20.4-NeoForge
1.20.4/PuzzlesLib-v20.4.15-1.20.4-Fabric
1.20.4/PuzzlesLib-v20.4.14-1.20.4-NeoForge
1.20.4/PuzzlesLib-v20.4.14-1.20.4-Forge
1.20.4/PuzzlesLib-v20.4.14-1.20.4-Fabric
1.20.4/PuzzlesLib-v20.4.13-1.20.4-NeoForge
1.20.4/PuzzlesLib-v20.4.13-1.20.4-Forge
1.20.4/PuzzlesLib-v20.4.13-1.20.4-Fabric
1.20.4/PuzzlesLib-v20.4.12-1.20.4-Forge
1.20.4/PuzzlesLib-v20.4.12-1.20.4-NeoForge
1.20.4/PuzzlesLib-v20.4.12-1.20.4-Fabric
1.20.4/PuzzlesLib-v20.4.11-1.20.4-Forge
1.20.4/PuzzlesLib-v20.4.11-1.20.4-NeoForge
1.20.4/PuzzlesLib-v20.4.11-1.20.4-Fabric
1.20.4/PuzzlesLib-v20.4.9-1.20.4-Forge
1.20.4/PuzzlesLib-v20.4.9-1.20.4-NeoForge
1.20.4/PuzzlesLib-v20.4.9-1.20.4-Fabric
1.20.4/PuzzlesLib-v20.4.7-1.20.4-Forge
1.20.4/PuzzlesLib-v20.4.7-1.20.4-NeoForge
1.20.4/PuzzlesLib-v20.4.7-1.20.4-Fabric
1.20.4/PuzzlesLib-v20.4.4-1.20.4-Forge
1.20.4/PuzzlesLib-v20.4.4-1.20.4-NeoForge
1.20.4/PuzzlesLib-v20.4.4-1.20.4-Fabric
1.20.4/PuzzlesLib-v20.4.3-1.20.4-Forge
1.20.4/PuzzlesLib-v20.4.3-1.20.4-NeoForge
1.20.4/PuzzlesLib-v20.4.3-1.20.4-Fabric
1.20.4/PuzzlesLib-v20.4.2-1.20.4-Forge
1.20.4/PuzzlesLib-v20.4.2-1.20.4-NeoForge
1.20.4/PuzzlesLib-v20.4.2-1.20.4-Fabric
1.20.1/PuzzlesLib-v8.1.21-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.1.21-1.20.1-Forge
1.20.1/PuzzlesLib-v8.1.20-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.1.20-1.20.1-Forge
1.20.1/PuzzlesLib-v8.1.19-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.1.19-1.20.1-Forge
1.20.1/PuzzlesLib-v8.1.18-1.20.1-Forge
1.20.1/PuzzlesLib-v8.1.18-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.1.17-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.1.17-1.20.1-Forge
1.20.1/PuzzlesLib-v8.1.16-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.1.16-1.20.1-Forge
1.20.1/PuzzlesLib-v8.1.15-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.1.15-1.20.1-Forge
1.20.1/PuzzlesLib-v8.1.14-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.1.14-1.20.1-Forge
1.20.1/PuzzlesLib-v8.1.13-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.1.13-1.20.1-Forge
1.20.1/PuzzlesLib-v8.1.12-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.1.12-1.20.1-Forge
1.20.1/PuzzlesLib-v8.1.11-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.1.11-1.20.1-Forge
1.20.1/PuzzlesLib-v8.1.9-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.1.9-1.20.1-Forge
1.20.1/PuzzlesLib-v8.1.8-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.1.8-1.20.1-Forge
1.20.1/PuzzlesLib-v8.1.7-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.1.7-1.20.1-Forge
1.20.1/PuzzlesLib-v8.1.5-1.20.1-Forge
1.20.1/PuzzlesLib-v8.1.5-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.1.3-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.1.3-1.20.1-Forge
1.20.1/PuzzlesLib-v8.1.2-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.1.2-1.20.1-Forge
1.20.1/PuzzlesLib-v8.1.1-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.1.1-1.20.1-Forge
1.20.1/PuzzlesLib-v8.1.0-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.1.0-1.20.1-Forge
1.20.1/PuzzlesLib-v8.0.24-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.0.24-1.20.1-Forge
1.20.1/PuzzlesLib-v8.0.23-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.0.23-1.20.1-Forge
1.20.1/PuzzlesLib-v8.0.21-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.0.21-1.20.1-Forge
1.20.1/PuzzlesLib-v8.0.20-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.0.20-1.20.1-Forge
1.20.1/PuzzlesLib-v8.0.19-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.0.19-1.20.1-Forge
1.20.1/PuzzlesLib-v8.0.18-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.0.18-1.20.1-Forge
1.20.1/PuzzlesLib-v8.0.15-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.0.15-1.20.1-Forge
1.20.1/PuzzlesLib-v8.0.14-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.0.14-1.20.1-Forge
1.20.1/PuzzlesLib-v8.0.13-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.0.13-1.20.1-Forge
1.20.1/PuzzlesLib-v8.0.12-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.0.12-1.20.1-Forge
1.20.1/PuzzlesLib-v8.0.11-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.0.11-1.20.1-Forge
1.20.1/PuzzlesLib-v8.0.7-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.0.7-1.20.1-Forge
1.20.1/PuzzlesLib-v8.0.5-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.0.5-1.20.1-Forge
1.20.1/PuzzlesLib-v8.0.4-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.0.4-1.20.1-Forge
1.20.1/PuzzlesLib-v8.0.2-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.0.2-1.20.1-Forge
1.20.1/PuzzlesLib-v8.0.1-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.0.1-1.20.1-Forge
1.20.1/PuzzlesLib-v8.0.0-1.20.1-Fabric
1.20.1/PuzzlesLib-v8.0.0-1.20.1-Forge
1.20/PuzzlesLib-v7.0.9-1.20-Fabric
1.20/PuzzlesLib-v7.0.9-1.20-Forge
1.20/PuzzlesLib-v7.0.3-1.20-Fabric
1.20/PuzzlesLib-v7.0.3-1.20-Forge
1.20/PuzzlesLib-v7.0.2-1.20-Fabric
1.20/PuzzlesLib-v7.0.2-1.20-Forge
1.20/PuzzlesLib-v7.0.0-1.20-Fabric
1.20/PuzzlesLib-v7.0.0-1.20-Forge

💾 基于此 PR 所打包的资源包:


thinair Mod Domain 验证通过。
⚠ 警告:PR 中 thinair-1.20 的中英文语言文件不对应。

  • 英文语言文件有 5 个 Key 多于中文语言文件。例如:
    • 行 29-effect.minecraft.water_breathing
    • 行 30-item.minecraft.tipped_arrow.effect.water_breathing
    • 行 31-item.minecraft.potion.effect.water_breathing
    • 行 32-item.minecraft.splash_potion.effect.water_breathing
  • 中文语言文件有 5 个 Key 多于英文语言文件。例如:
    • 行 29-cfpa.conflictnamespace.effect.minecraft.water_breathing
    • 行 30-cfpa.conflictnamespace.item.minecraft.tipped_arrow.effect.water_breathing
    • 行 31-cfpa.conflictnamespace.item.minecraft.potion.effect.water_breathing
    • 行 32-cfpa.conflictnamespace.item.minecraft.splash_potion.effect.water_breathing

⚠ 警告:PR 中 thinair-1.20 的英文语言文件与最新模组 ThinAir-v20.4.2-1.20.4-NeoForge.jar 内的英文语言文件不对应。自动获取的文件只能反映大多数情况,可能并不需要更新文件。如果你认为英文语言文件确实需要更新到上面的版本,可以使用命令 /update-en new-thin-air 1.20 来更新。

  • 英文语言文件有 18 个 Key 多于模组内语言文件。例如:
    • 行 10-advancement.thinair:root
    • 行 11-advancement.thinair:root.desc
    • 行 12-advancement.thinair:air_bladder
    • 行 13-advancement.thinair:air_bladder.desc
  • 模组内语言文件有 19 个 Key 多于英文语言文件。例如:
    • 行 2-advancements.thinair.air_bladder.description
    • 行 3-advancements.thinair.air_bladder.title
    • 行 4-advancements.thinair.blue_air.description
    • 行 5-advancements.thinair.blue_air.title
详细检查报告 开始检查 thinair 1.20
thinair-1.20 中文语言文件共有 31 个 Key; 英文语言文件共有 31 个 Key
英文多于中文的 Key: 
    effect.minecraft.water_breathing
    item.minecraft.tipped_arrow.effect.water_breathing
    item.minecraft.potion.effect.water_breathing
    item.minecraft.splash_potion.effect.water_breathing
    item.minecraft.lingering_potion.effect.water_breathing

中文多于英文的 Key: 
    cfpa.conflictnamespace.effect.minecraft.water_breathing
    cfpa.conflictnamespace.item.minecraft.tipped_arrow.effect.water_breathing
    cfpa.conflictnamespace.item.minecraft.potion.effect.water_breathing
    cfpa.conflictnamespace.item.minecraft.splash_potion.effect.water_breathing
    cfpa.conflictnamespace.item.minecraft.lingering_potion.effect.water_breathing


thinair-1.20 模组内语言文件共有 32 个 Key;
英文多于模组内的 Key: 
    advancement.thinair:root
    advancement.thinair:root.desc
    advancement.thinair:air_bladder
    advancement.thinair:air_bladder.desc
    advancement.thinair:soul
    advancement.thinair:soul.desc
    advancement.thinair:soulfire_bottle
    advancement.thinair:soulfire_bottle.desc
    advancement.thinair:protection_from_yellow
    advancement.thinair:protection_from_yellow.desc
    advancement.thinair:protection_from_red
    advancement.thinair:protection_from_red.desc
    advancement.thinair:lantern
    advancement.thinair:lantern.desc
    advancement.thinair:disco_lantern
    advancement.thinair:disco_lantern.desc
    advancement.thinair:signal_torch
    advancement.thinair:signal_torch.desc

模组内多于英文的 Key: 
    advancements.thinair.air_bladder.description
    advancements.thinair.air_bladder.title
    advancements.thinair.blue_air.description
    advancements.thinair.blue_air.title
    advancements.thinair.disco_lantern.description
    advancements.thinair.disco_lantern.title
    advancements.thinair.respirator.description
    advancements.thinair.respirator.title
    advancements.thinair.root.description
    advancements.thinair.root.title
    advancements.thinair.safety_lantern.description
    advancements.thinair.safety_lantern.title
    advancements.thinair.signal_torch.description
    advancements.thinair.signal_torch.title
    advancements.thinair.soulfire_bottle.description
    advancements.thinair.soulfire_bottle.title
    advancements.thinair.water_breathing.description
    advancements.thinair.water_breathing.title
    item.thinair.reinforced_air_bladder


报告也可以在 这里 查看。在 PR 更新时这里的检查也会自动更新。


🔛 Diff:

new-thin-air/1.20
英文 中文
自由呼吸
自由呼吸之箭
自由呼吸药水
喷溅型自由呼吸药水
滞留型自由呼吸药水
new-thin-air/1.20-keys
Key 英文 中文
cfpa.conflictnamespace.effect.minecraft.water_breathing 自由呼吸
cfpa.conflictnamespace.item.minecraft.tipped_arrow.effect.water_breathing 自由呼吸之箭
cfpa.conflictnamespace.item.minecraft.potion.effect.water_breathing 自由呼吸药水
cfpa.conflictnamespace.item.minecraft.splash_potion.effect.water_breathing 喷溅型自由呼吸药水
cfpa.conflictnamespace.item.minecraft.lingering_potion.effect.water_breathing 滞留型自由呼吸药水
new-thin-air/1.20-术语检查
Key 英文 中文 检查结果

机器人的命令列表

  • 🔄 勾选这个复选框来强制刷新

@SlimeSB SlimeSB changed the title new-thin-air 与 原版撞key修复 new-thin-air 与原版撞key修复 Jul 14, 2024
@SlimeSB
Copy link
Copy Markdown
Collaborator Author

SlimeSB commented Jul 15, 2024

image

@luoxueyasha luoxueyasha added the 即将合并 在此标签被添加的 24 小时后 Pull Request 才可被合并 label Jul 16, 2024
@luoxueyasha luoxueyasha removed the 即将合并 在此标签被添加的 24 小时后 Pull Request 才可被合并 label Jul 16, 2024
@luoxueyasha
Copy link
Copy Markdown
Collaborator

luoxueyasha commented Jul 16, 2024

等下,这个是只要加载这个模组就会撞key,还是无论有没有加载这个模组都会撞key?

毕竟我看模组本意就是替换水下呼吸……?

@SlimeSB
Copy link
Copy Markdown
Collaborator Author

SlimeSB commented Jul 16, 2024

不加载也会撞,也许以后可以通过检查模组列表,下载相应包含冲突键资源包解决

@SlimeSB SlimeSB added the 即将合并 在此标签被添加的 24 小时后 Pull Request 才可被合并 label Jul 16, 2024
Copy link
Copy Markdown
Member

@mamaruo mamaruo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

相关问题可能需要共识

  • cfpa.conflictnamespace. 的规范化
  • 何时需要排除

@SlimeSB
Copy link
Copy Markdown
Collaborator Author

SlimeSB commented Jul 17, 2024

连一下 #1954
我觉得把消除本地化冲突抄到模组本体为好

@SlimeSB SlimeSB merged commit 56aedcd into CFPAOrg:main Jul 19, 2024
@SlimeSB SlimeSB deleted the water-breath branch July 28, 2024 12:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

1.20.x Minecraft 版本标签 10+ 行数标签 Forge 包含 Forge 模组 即将合并 在此标签被添加的 24 小时后 Pull Request 才可被合并

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants