Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2026-01-04 15:41:38 +00:00
Code Issues Releases Activity

optimize(core): 优化代码

Browse Source
This commit is contained in:
jhqwqmc
2025-03-15 14:46:30 +08:00
parent 40862cd88e
commit da84189ce1
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/src/main/java/net/momirealms/craftengine/core/pack/conflict/resolution/MergePackMcMetaResolution.java
View File

@@ -4,11 +4,13 @@ import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import net.momirealms.craftengine.core.plugin.CraftEngine;
import net.momirealms.craftengine.core.util.AdventureHelper;
import net.momirealms.craftengine.core.util.GsonHelper;
import net.momirealms.craftengine.core.util.Key;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.lang.reflect.Type;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.HashMap;
@@ -23,25 +25,19 @@ public class MergePackMcMetaResolution implements Resolution {
this.description = description;
}
@SuppressWarnings("unchecked")
public static void mergeMcmeta(Path existing, Path conflict, String customDescription) throws IOException {
Gson gson = new Gson();
Gson gson = GsonHelper.get();
Type dataType = new TypeToken<Map<String, Object>>() {}.getType();
Map<String, Object> existingData = gson.fromJson(new FileReader(existing.toFile()), new TypeToken<Map<String, Object>>() {}.getType());
Map<String, Object> conflictData = gson.fromJson(new FileReader(conflict.toFile()), new TypeToken<Map<String, Object>>() {}.getType());
String jsonDescription = gson.fromJson(AdventureHelper.miniMessageToJson(customDescription), dataType);
Map<String, Object> existingData = gson.fromJson(new FileReader(existing.toFile()), dataType);
Map<String, Object> conflictData = gson.fromJson(new FileReader(conflict.toFile()), dataType);
Map<String, Object> merged = (Map<String, Object>) mergeValues(existingData, conflictData);
processPackField(
merged, existingData, conflictData,
gson.fromJson(
AdventureHelper.miniMessageToJson(customDescription),
new TypeToken<Map<String, Object>>() {}.getType()
)
);
processPackField(merged, existingData, conflictData, jsonDescription);
Object cleaned = cleanEmpty(merged);