为overlay做准备

common-files/src/main/resources/blockstates.yml

@@ -1,92 +1,3 @@
-minecraft:note_block:
-  instrument=harp:
-    model: "minecraft:block/note_block"
-minecraft:tripwire:
-  attached=true,east=true,north=true,south=true,disarmed=true,west=true,powered=true:
-    model: "minecraft:block/tripwire_attached_nsew"
-minecraft:red_mushroom_block:
-  down=true,east=true,north=true,south=true,up=true,west=true:
-    model: "minecraft:block/red_mushroom_block_inventory"
-minecraft:brown_mushroom_block:
-  down=true,east=true,north=true,south=true,up=true,west=true:
-    model: "minecraft:block/brown_mushroom_block_inventory"
-minecraft:mushroom_stem:
-  down=true,east=true,north=true,south=true,up=true,west=true:
-    model: "minecraft:block/mushroom_stem_inventory"
-minecraft:kelp:
-  age=0:
-    model: "minecraft:block/kelp"
-minecraft:weeping_vines:
-  age=0:
-    model: "minecraft:block/weeping_vines"
-minecraft:twisting_vines:
-  age=0:
-    model: "minecraft:block/twisting_vines"
-minecraft:cave_vines:
-  age=0,berries=false:
-    model: "minecraft:block/cave_vines"
-  age=0,berries=true:
-    model: "minecraft:block/cave_vines_lit"
-minecraft:sugar_cane:
-  age=0:
-    model: "minecraft:block/sugar_cane"
-minecraft:oak_leaves:
-  distance=7,persistent=true:
-    model: "minecraft:block/oak_leaves"
-minecraft:acacia_leaves:
-  distance=7,persistent=true:
-    model: "minecraft:block/acacia_leaves"
-minecraft:jungle_leaves:
-  distance=7,persistent=true:
-    model: "minecraft:block/jungle_leaves"
-minecraft:birch_leaves:
-  distance=7,persistent=true:
-    model: "minecraft:block/birch_leaves"
-minecraft:mangrove_leaves:
-  distance=7,persistent=true:
-    model: "minecraft:block/mangrove_leaves"
-minecraft:cherry_leaves:
-  distance=7,persistent=true:
-    model: "minecraft:block/cherry_leaves"
-minecraft:dark_oak_leaves:
-  distance=7,persistent=true:
-    model: "minecraft:block/dark_oak_leaves"
-minecraft:azalea_leaves:
-  distance=7,persistent=true:
-    model: "minecraft:block/azalea_leaves"
-minecraft:flowering_azalea_leaves:
-  distance=7,persistent=true:
-    model: "minecraft:block/flowering_azalea_leaves"
-minecraft:spruce_leaves:
-  distance=7,persistent=true:
-    model: "minecraft:block/spruce_leaves"
-minecraft:pale_oak_leaves:
-  distance=7,persistent=true:
-    model: "minecraft:block/pale_oak_leaves"
 minecraft:chorus_plant:
   down=true,east=true,north=true,south=true,up=true,west=true:
-    model: "minecraft:block/default_chorus_plant"
-minecraft:oak_sapling:
-  stage=0:
-    model: "minecraft:block/oak_sapling"
-minecraft:birch_sapling:
-  stage=0:
-    model: "minecraft:block/birch_sapling"
-minecraft:spruce_sapling:
-  stage=0:
-    model: "minecraft:block/spruce_sapling"
-minecraft:jungle_sapling:
-  stage=0:
-    model: "minecraft:block/jungle_sapling"
-minecraft:dark_oak_sapling:
-  stage=0:
-    model: "minecraft:block/dark_oak_sapling"
-minecraft:acacia_sapling:
-  stage=0:
-    model: "minecraft:block/acacia_sapling"
-minecraft:cherry_sapling:
-  stage=0:
-    model: "minecraft:block/cherry_sapling"
-minecraft:pale_oak_sapling:
-  stage=0:
-    model: "minecraft:block/pale_oak_sapling"
+    model: "minecraft:block/default_chorus_plant"

common-files/src/main/resources/config.yml

@@ -57,6 +57,8 @@ resource-pack:
   # Validate if there are any errors in the resource pack, such as missing textures or models
   validate:
     enable: true
+  # Define the name of the overlay folders
+  overlay-format: "overlay_{version}"
   supported-version:
     min: "1.20"
     max: LATEST

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

@@ -381,4 +381,5 @@ warning.config.resource_pack.generation.missing_model_texture: "<yellow>Model '<
 warning.config.resource_pack.generation.missing_item_model: "<yellow>Item '<arg:0>' is missing model file: '<arg:1>'</yellow>"
 warning.config.resource_pack.generation.missing_block_model: "<yellow>Block '<arg:0>' is missing model file: '<arg:1>'</yellow>"
 warning.config.resource_pack.generation.missing_parent_model: "<yellow>Model '<arg:0>' cannot find parent model: '<arg:1>'</yellow>"
-warning.config.resource_pack.generation.malformatted_json: "<yellow>Json file '<arg:0>' is malformatted.</yellow>"
+warning.config.resource_pack.generation.malformatted_json: "<yellow>Json file '<arg:0>' is malformatted.</yellow>"
+warning.config.resource_pack.invalid_overlay_format: "<yellow>Issue found in config.yml at 'resource-pack.overlay-format' - Invalid overlay format '<arg:0>'. Overlay format must contain the placeholder '{version}'.</yellow>"

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

@@ -381,4 +381,5 @@ warning.config.resource_pack.generation.missing_model_texture: "<yellow>模型'<
 warning.config.resource_pack.generation.missing_item_model: "<yellow>物品'<arg:0>'缺少模型文件: '<arg:1>'</yellow>"
 warning.config.resource_pack.generation.missing_block_model: "<yellow>方块'<arg:0>'缺少模型文件: '<arg:1>'</yellow>"
 warning.config.resource_pack.generation.missing_parent_model: "<yellow>模型'<arg:0>'找不到父级模型文件: '<arg:1>'</yellow>"
-warning.config.resource_pack.generation.malformatted_json: "<yellow>Json文件 '<arg:0>' 格式错误.</yellow>"
+warning.config.resource_pack.generation.malformatted_json: "<yellow>Json文件 '<arg:0>' 格式错误.</yellow>"
+warning.config.resource_pack.invalid_overlay_format: "<yellow>在 config.yml 的 'resource-pack.overlay-format' 处发现问题 - 无效的overlay格式 '<arg:0>'. Overlay格式必须包含占位符 '{version}'.</yellow>"