修

common-files/src/main/resources/resources/default/configuration/i18n.yml

@@ -161,7 +161,7 @@ lang:
     block_name:default:amethyst_wall_torch: Amethyst Torch
     block_name:default:hami_melon: Hami Melon
     block_name:default:hami_melon_stem: Hami Melon Stem
-    block_name:default:default:attached_hami_melon_stem: Hami Melon Stem
+    block_name:default:attached_hami_melon_stem: Hami Melon Stem
     block_name:default:palm_button: Palm Button
     block_name:default:palm_fence: Palm Fence
   zh_cn:
@@ -196,6 +196,6 @@ lang:
     block_name:default:amethyst_wall_torch: 紫水晶火把
     block_name:default:hami_melon: 哈密瓜
     block_name:default:hami_melon_stem: 哈密瓜茎
-    block_name:default:default:attached_hami_melon_stem: 哈密瓜茎
+    block_name:default:attached_hami_melon_stem: 哈密瓜茎
     block_name:default:palm_button: 棕榈木按钮
     block_name:default:palm_fence: 棕榈木栅栏

common-files/src/main/resources/resources/default/configuration/templates.yml

@@ -3930,43 +3930,6 @@ templates#block_states:
           resistance: 1200.0
           burnable: false
           fluid-state: water
-  default:block_state/mushroom:
-    properties:
-      facing:
-        type: horizontal_direction
-    appearances:
-      north:
-        state: ${base_block}[waterlogged=false,facing=north]
-        model:
-          path: ${model_path}
-      east:
-        state: ${base_block}[waterlogged=false,facing=east]
-        model:
-          path: ${model_path}
-          y: 90
-      west:
-        state: ${base_block}[waterlogged=false,facing=west]
-        model:
-          path: ${model_path}
-          y: 270
-      south:
-        state: ${base_block}[waterlogged=false,facing=south]
-        model:
-          path: ${model_path}
-          y: 180
-    variants:
-      facing=north:
-        appearance: north
-        id: 0
-      facing=east:
-        appearance: east
-        id: 1
-      facing=west:
-        appearance: west
-        id: 2
-      facing=south:
-        appearance: south
-        id: 3
 # recipes
 templates#recipes:
   default:recipe/planks:

common-files/src/main/resources/translations/en.yml

@@ -336,7 +336,7 @@ warning.config.block.behavior.stem.missing_attached_stem: "<yellow>Issue found i
 warning.config.block.behavior.attached_stem.missing_facing: "<yellow>Issue found in file <arg:0> - The block '<arg:1>' is missing the required 'facing' property for 'attached_stem_block' behavior.</yellow>"
 warning.config.block.behavior.attached_stem.missing_fruit: "<yellow>Issue found in file <arg:0> - The block '<arg:1>' is missing the required 'fruit' argument for 'attached_stem_block' behavior.</yellow>"
 warning.config.block.behavior.attached_stem.missing_stem: "<yellow>Issue found in file <arg:0> - The block '<arg:1>' is missing the required 'stem' argument for 'attached_stem_block' behavior.</yellow>"
-warning.config.block.behavior.chime.missing_hit_sound: "<yellow>Issue found in file <arg:0> - The block '<arg:1>' is missing the required 'hit-sound' argument for 'chime_block' behavior.</yellow>"
+warning.config.block.behavior.chime.missing_sounds_hit: "<yellow>Issue found in file <arg:0> - The block '<arg:1>' is missing the required 'sounds.hit' argument for 'chime_block' behavior.</yellow>"
 warning.config.model.generation.missing_parent: "<yellow>Issue found in file <arg:0> - The config '<arg:1>' is missing the required 'parent' argument in 'generation' section.</yellow>"
 warning.config.model.generation.conflict: "<yellow>Issue found in file <arg:0> - Failed to generate model for '<arg:1>' as two or more configurations attempt to generate different json models with the same path: '<arg:2>'.</yellow>"
 warning.config.model.generation.invalid_display_position: "<yellow>Issue found in file <arg:0> - The config '<arg:1>' is using an invalid display position '<arg:2>' in 'generation.display' section. Allowed display positions: [<arg:3>]</yellow>"

common-files/src/main/resources/translations/zh_cn.yml

@@ -330,7 +330,7 @@ warning.config.block.behavior.stem.missing_attached_stem: "<yellow>在文件 <ar
 warning.config.block.behavior.attached_stem.missing_facing: "<yellow>在文件 <arg:0> 发现问题 - 方块 '<arg:1>' 的 'attached_stem_block' 行为缺少必需的 'facing' 属性</yellow>"
 warning.config.block.behavior.attached_stem.missing_fruit: "<yellow>在文件 <arg:0> 发现问题 - 方块 '<arg:1>' 的 'attached_stem_block' 行为缺少必需的 'fruit' 选项</yellow>"
 warning.config.block.behavior.attached_stem.missing_stem: "<yellow>在文件 <arg:0> 发现问题 - 方块 '<arg:1>' 的 'attached_stem_block' 行为缺少必需的 'stem' 选项</yellow>"
-warning.config.block.behavior.chime.missing_hit_sound: "<yellow>在文件 <arg:0> 发现问题 - 方块 '<arg:1>' 的 'chime_block' 行为缺少必需的 'hit-sound' 选项</yellow>"
+warning.config.block.behavior.chime.missing_sounds_hit: "<yellow>在文件 <arg:0> 发现问题 - 方块 '<arg:1>' 的 'chime_block' 行为缺少必需的 'sounds.hit' 选项</yellow>"
 warning.config.model.generation.missing_parent: "<yellow>在文件 <arg:0> 发现问题 - 配置项 '<arg:1>' 的 'generation' 段落缺少必需的 'parent' 参数</yellow>"
 warning.config.model.generation.conflict: "<yellow>在文件 <arg:0> 发现问题 - 无法为 '<arg:1>' 生成模型 存在多个配置尝试使用相同路径 '<arg:2>' 生成不同的 JSON 模型</yellow>"
 warning.config.model.generation.invalid_display_position: "<yellow>在文件 <arg:0> 发现问题 - 配置项 '<arg:1>' 在 'generation.display' 区域使用了无效的 display 位置类型 '<arg:2>'. 可用展示类型: [<arg:3>]</yellow>"