Merge branch 'Xiao-MoMi:dev' into dev

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

@@ -16,13 +16,16 @@ resource-pack:
   # This option determines the location of the generated resource pack
   # You can use either an absolute path or a relative path here
   path: "./generated/resource_pack.zip"
+  # The minimum client version supported by CraftEngine is 1.16. If you need to provide support for lower client versions, please modify the resource pack yourself.
   # Allowed values:
-  # - 1.20.1, 1.21, 1.21.8, etc.
+  # - 1.20.1, 1.21, 1.21.8, 26.1, etc.
   # - latest: the latest client version
   # - server: the current server version
   supported-version:
     min: server
     max: latest
+  # The description of your resource pack
+  description: "<gray>CraftEngine ResourcePack</gray>"
   # Remove 1.21.5+ tinted_leaves particles
   remove-tinted-leaves-particle: true
   # Define the name of the overlay folders
@@ -64,7 +67,6 @@ resource-pack:
         path: "pack.mcmeta"
       resolution:
         type: merge_pack_mcmeta
-        description: "<gray>CraftEngine ResourcePack</gray>"
     - term:
         type: exact
         path: "pack.png"
@@ -94,13 +96,12 @@ resource-pack:
       resolution:
         type: merge_font
   # Validate if there is any error in the resource pack, such as missing textures or models.
-  # Validation may not always be accurate due to the presence of resource pack overlays.
   # If your resource pack is compliant with the standard, you can disable validation to improve the resource pack generation speed.
   validation:
     enable: true
     # Fix textures that are not within the atlas. It is unreasonable to always rely on plugins to fix your mistakes.
     # You should strive to make your resource pack more standardized after gaining some experience with resource packs.
-    # When a model file mixes textures from both the blocks atlas and the items atlas, you must manually fix the issue.
+    # The fix-atlas feature is not all-powerful since 1.21.11. In some cases, CraftEngine cannot fix it for you, and you will need to fix your model yourself.
     fix-atlas: true
   # Optimize your resource pack by reducing its size without any quality loss.
   optimization:

common-files/src/main/resources/resources/default/resourcepack/pack.mcmeta

@@ -1,12 +0,0 @@
-{
-  "pack": {
-    "pack_format": 15,
-    "description": "CraftEngine",
-    "supported_formats": {
-      "min_inclusive": 15,
-      "max_inclusive": 1000
-    },
-    "min_format": 15,
-    "max_format": 1000
-  }
-}

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

@@ -40,14 +40,16 @@ argument.parse.failure.either: "<red>Could not resolve <arg:1> or <arg:2> from '
 argument.parse.failure.namedtextcolor: "<red>'<arg:0>' is not a named text color</red>"
 info.pack.load: "Loaded pack: <arg:0>. Default namespace: <arg:1>"
 info.resource.load: "Loaded <arg:0> in <arg:1>ms (<arg:2>)"
-info.resource_pack.start: "Generating resource pack..."
-info.resource_pack.generate: "Generated resource pack in <arg:0>ms"
-info.resource_pack.validate: "Validated resource pack in <arg:0>ms"
-info.resource_pack.optimize: "Optimized resource pack in <arg:0>ms"
+info.resource_pack.generate.start: "Generating resource pack..."
+info.resource_pack.generate.finish: "Generated resource pack in <arg:0>ms"
+info.resource_pack.validate.start: "Validating resource pack... (Progress: <arg:0>/<arg:1> | Pack Format: <arg:2>~<arg:3> | Overlays: <arg:4>)"
+info.resource_pack.validate.finish: "Validated resource pack in <arg:0>ms"
 info.resource_pack.optimize.json: "> Optimizing json files..."
 info.resource_pack.optimize.texture: "> Optimizing textures..."
 info.resource_pack.optimize.result: "□ Before/After/Ratio: <arg:0>/<arg:1>/<arg:2>%"
-info.resource_pack.create: "Created resource pack zip in <arg:0>ms"
+info.resource_pack.optimize.finish: "Optimized resource pack in <arg:0>ms"
+info.resource_pack.create.start: "Creating the resource pack zip..."
+info.resource_pack.create.finish: "Created resource pack zip in <arg:0>ms"
 info.resource_pack.upload: "Completed uploading resource pack"
 info.host.self.netty_server: "Netty HTTP server started on port: <arg:0>"
 info.host.cache.load: "[<arg:0>] Loaded cached resource pack metadata"

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

@@ -40,14 +40,16 @@ argument.parse.failure.either: "<red>无法从 '<arg:0>' 解析 <arg:1> 或 <arg
 argument.parse.failure.namedtextcolor: "<red>'<arg:0>' 不是颜色代码</red>"
 info.pack.load: "已加载包: <arg:0>. 默认命名空间: <arg:1>"
 info.resource.load: "加载 <arg:0> 耗时 <arg:1>ms (<arg:2>)"
-info.resource_pack.start: "正在开始生成资源包..."
-info.resource_pack.generate: "生成资源包耗时 <arg:0>ms"
-info.resource_pack.validate: "验证资源包耗时 <arg:0>ms"
-info.resource_pack.optimize: "优化资源包耗时 <arg:0>ms"
+info.resource_pack.generate.start: "正在开始生成资源包..."
+info.resource_pack.generate.finish: "生成资源包耗时 <arg:0>ms"
+info.resource_pack.validate.start: "正在验证资源包... (进度: <arg:0>/<arg:1> | 资源包格式: <arg:2>~<arg:3> | 叠加资源包: <arg:4>)"
+info.resource_pack.validate.finish: "验证资源包耗时 <arg:0>ms"
 info.resource_pack.optimize.json: "> 正在优化json文件..."
 info.resource_pack.optimize.texture: "> 正在优化贴图文件..."
 info.resource_pack.optimize.result: "□ 优化前/优化后/比例: <arg:0>/<arg:1>/<arg:2>%"
-info.resource_pack.create: "创建资源包文件耗时 <arg:0>ms"
+info.resource_pack.optimize.finish: "优化资源包耗时 <arg:0>ms"
+info.resource_pack.create.start: "正在创建资源包压缩文件..."
+info.resource_pack.create.finish: "创建资源包文件耗时 <arg:0>ms"
 info.resource_pack.upload: "资源包上传完成"
 info.host.self.netty_server: "Netty HTTP 服务已在端口 <arg:0> 开启"
 info.host.cache.load: "[<arg:0>] 已加载缓存的资源包元数据"