Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2025-12-30 12:29:15 +00:00
Code Issues Releases Activity

修复合并资源包元文件

Browse Source
This commit is contained in:
jhqwqmc
2025-10-21 01:42:45 +08:00
parent 784c121f00
commit 7c12de0016
2 changed files with 56 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/net/momirealms/craftengine/core/pack/AbstractPackManager.java
View File

@@ -771,6 +771,8 @@ public abstract class AbstractPackManager implements PackManager {
entry.add("formats", formats);
formats.addProperty("min_inclusive", revision.minPackVersion());
formats.addProperty("max_inclusive", revision.maxPackVersion());
entry.addProperty("min_format", revision.minPackVersion());
entry.addProperty("max_format", revision.maxPackVersion());
entry.addProperty("directory", Config.createOverlayFolderName(revision.versionString()));
entries.add(entry);
}

54
core/src/main/java/net/momirealms/craftengine/core/pack/conflict/resolution/ResolutionMergePackMcMeta.java
View File

@@ -165,6 +165,60 @@ public class ResolutionMergePackMcMeta implements Resolution {
}
}
if (merged.has("overlays")) {
JsonObject overlays = merged.getAsJsonObject("overlays");
if (overlays.has("entries")) {
JsonArray entries = overlays.getAsJsonArray("entries");
for (JsonElement entry : entries) {
JsonObject jsonObject = entry.getAsJsonObject();
int[] min = new int[]{Integer.MAX_VALUE, 0};
int[] max = new int[]{Integer.MIN_VALUE, 0};
if (jsonObject.has("formats")) {
MinMax mm = parseSupportedFormats(jsonObject.get("formats"));
min[0] = mm.min;
max[0] = mm.max;
}
if (jsonObject.has("min_format")) {
JsonElement minFormat = jsonObject.get("min_format");
if (minFormat.isJsonPrimitive()) {
min[0] = Math.min(min[0], minFormat.getAsInt());
} else if (minFormat.isJsonArray()) {
JsonArray minFormatArray = minFormat.getAsJsonArray();
min[0] = Math.min(min[0], minFormatArray.get(0).getAsInt());
if (minFormatArray.size() > 1) {
min[1] = Math.min(min[1], minFormatArray.get(1).getAsInt());
}
}
}
if (jsonObject.has("max_format")) {
JsonElement maxFormat = jsonObject.get("max_format");
if (maxFormat.isJsonPrimitive()) {
max[0] = Math.max(max[0], maxFormat.getAsInt());
}
if (maxFormat.isJsonArray()) {
JsonArray maxFormatArray = maxFormat.getAsJsonArray();
max[0] = Math.max(max[0], maxFormatArray.get(0).getAsInt());
if (maxFormatArray.size() > 1) {
max[1] = Math.max(max[1], maxFormatArray.get(1).getAsInt());
}
}
}
JsonObject mergedFormats = new JsonObject();
mergedFormats.addProperty("min_inclusive", min[0]);
mergedFormats.addProperty("max_inclusive", max[0]);
jsonObject.add("formats", mergedFormats);
JsonArray mergedMinFormat = new JsonArray(2);
mergedMinFormat.add(min[0]);
mergedMinFormat.add(min[1]);
jsonObject.add("min_format", mergedMinFormat);
JsonArray mergedMaxFormat = new JsonArray(2);
mergedMaxFormat.add(max[0]);
mergedMaxFormat.add(max[1]);
jsonObject.add("max_format", mergedMaxFormat);
}
}
}
GsonHelper.writeJsonFile(merged, file1);
}