✨ feat: 重构资源包转换逻辑

Author: ChouChiu

src/main/java/i18nupdatemod/I18nUpdateMod.java

@@ -7,6 +7,7 @@
 import i18nupdatemod.core.ResourcePack;
 import i18nupdatemod.core.ResourcePackConverter;
 import i18nupdatemod.entity.GameAssetDetail;
+import i18nupdatemod.entity.GameMetaData;
 import i18nupdatemod.util.FileUtil;
 import i18nupdatemod.util.Log;
 
@@ -74,8 +75,9 @@ public static void init(Path minecraftPath, String minecraftVersion, String load
             if (!convertNotNeed) {
                 FileUtil.setTemporaryDirPath(Paths.get(localStorage, "." + MOD_ID, minecraftVersion));
                 applyFileName = assets.covertFileName;
+                GameMetaData metaData = I18nConfig.getPackFormat(minecraftVersion);
                 ResourcePackConverter converter = new ResourcePackConverter(languagePacks, applyFileName);
-                converter.convert(assets.covertPackFormat, assets.minFormat, assets.maxFormat, getResourcePackDescription(assets.downloads));
+                converter.convert(metaData, getResourcePackDescription(assets.downloads));
             }
 
             //Apply resource pack

src/main/java/i18nupdatemod/core/I18nConfig.java

@@ -71,14 +71,15 @@ public static GameAssetDetail getAssetDetail(String minecraftVersion, String loa
             ret.downloads = createDownloadDetails(convert, loader, assetRoot);
         }
 
-        ret.covertPackFormat = convert.packFormat;
-        ret.minFormat = convert.minFormat;
-        ret.maxFormat = convert.maxFormat;
         ret.covertFileName =
                 String.format("Minecraft-Mod-Language-Modpack-Converted-%s.zip", minecraftVersion);
         return ret;
     }
 
+    public static GameMetaData getPackFormat(String minecraftVersion) {
+        return getGameMetaData(minecraftVersion);
+    }
+
     private static List<GameAssetDetail.AssetDownloadDetail> createDownloadDetails(GameMetaData convert, String loader, String assetRoot) {
         return convert.convertFrom.stream().map(it -> getAssetMetaData(it, loader)).map(it -> {
             GameAssetDetail.AssetDownloadDetail adi = new GameAssetDetail.AssetDownloadDetail();

src/main/java/i18nupdatemod/core/ResourcePackConverter.java

@@ -2,6 +2,7 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import i18nupdatemod.entity.GameMetaData;
 import i18nupdatemod.util.FileUtil;
 import i18nupdatemod.util.Log;
 import org.apache.commons.io.IOUtils;
@@ -32,7 +33,7 @@ public ResourcePackConverter(List<ResourcePack> resourcePack, String filename) {
         this.tmpFilePath = FileUtil.getTemporaryPath(filename);
     }
 
-    public void convert(Integer packFormat, Integer minFormat, Integer maxFormat, String description) throws Exception {
+    public void convert(GameMetaData metaData, String description) throws Exception {
         Set<String> fileList = new HashSet<>();
         try (ZipOutputStream zos = new ZipOutputStream(
                 Files.newOutputStream(tmpFilePath),
@@ -57,7 +58,7 @@ public void convert(Integer packFormat, Integer minFormat, Integer maxFormat, St
                         InputStream is = zf.getInputStream(ze);
                         if (name.equalsIgnoreCase("pack.mcmeta")) {
                             //Convert pack.mcmeta
-                            zos.write(convertPackMeta(is, packFormat, minFormat, maxFormat, description));
+                            zos.write(convertPackMeta(is, metaData, description));
                         } else {
                             //Copy other file
                             IOUtils.copy(is, zos);
@@ -74,15 +75,15 @@ public void convert(Integer packFormat, Integer minFormat, Integer maxFormat, St
         }
     }
 
-    private byte[] convertPackMeta(InputStream is, Integer packFormat, Integer minFormat, Integer maxFormat, String description) {
+    private byte[] convertPackMeta(InputStream is, GameMetaData metaData, String description) {
         PackMeta meta = GSON.fromJson(new InputStreamReader(is, StandardCharsets.UTF_8), PackMeta.class);
         // 1.21.9+ 使用 min_format/max_format，不再使用 pack_format
-        if (minFormat != null && maxFormat != null) {
+        if (metaData.useNewFormat()) {
             meta.pack.pack_format = null;
-            meta.pack.min_format = minFormat;
-            meta.pack.max_format = maxFormat;
+            meta.pack.min_format = metaData.minFormat;
+            meta.pack.max_format = metaData.maxFormat;
         } else {
-            meta.pack.pack_format = packFormat;
+            meta.pack.pack_format = metaData.packFormat;
             meta.pack.min_format = null;
             meta.pack.max_format = null;
         }

src/main/java/i18nupdatemod/entity/GameAssetDetail.java

@@ -4,9 +4,6 @@
 
 public class GameAssetDetail {
     public List<AssetDownloadDetail> downloads;
-    public Integer covertPackFormat;   // 旧格式 pack_format
-    public Integer minFormat;          // 新格式 min_format
-    public Integer maxFormat;          // 新格式 max_format
     public String covertFileName;
 
     public static class AssetDownloadDetail {

src/main/java/i18nupdatemod/entity/GameMetaData.java

@@ -8,4 +8,12 @@ public class GameMetaData {
     public Integer minFormat;      // 新格式，用于 1.21.9 及之后
     public Integer maxFormat;      // 新格式，用于 1.21.9 及之后
     public List<String> convertFrom;
+
+    /**
+     * 判断是否使用新格式 (min_format/max_format)
+     * 1.21.9+ 使用新格式，不再使用 pack_format
+     */
+    public boolean useNewFormat() {
+        return minFormat != null && maxFormat != null;
+    }
 }