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

保证语言文件有序性

Browse Source
This commit is contained in:
XiaoMoMi
2025-12-16 18:46:20 +08:00
parent c17455c547
commit 7af13286eb
4 changed files with 39 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common-files/src/main/resources/config.yml
View File

@@ -93,7 +93,8 @@ resource-pack:
path: "assets/minecraft/font/uniform.json"
resolution:
type: merge_font
# Validate if there is any error in the resource pack, such as missing textures or models
# 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 overlays, and it is time-consuming for plugins to simulate multiple client versions for testing.
# If your resource pack is compliant with the standard, you can disable validation to improve the resource pack generation speed.
validation:
enable: true

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

@@ -123,8 +123,8 @@ public abstract class AbstractPackManager implements PackManager {
private final Map<String, Pack> loadedPacks = new HashMap<>();
private final Map<String, ConfigParser> sectionParsers = new HashMap<>();
private final TreeSet<ConfigParser> sortedParsers = new TreeSet<>();
private final JsonObject vanillaBlockAtlas;
private final JsonObject vanillaItemAtlas;
public final JsonObject vanillaBlockAtlas;
public final JsonObject vanillaItemAtlas;
private Map<Path, CachedConfigFile> cachedConfigFiles = Collections.emptyMap();
private Map<Path, CachedAssetFile> cachedAssetFiles = Collections.emptyMap();
protected BiConsumer<Path, Path> zipGenerator;
@@ -886,61 +886,6 @@ public abstract class AbstractPackManager implements PackManager {
}
}
private void processAtlas(JsonObject atlasJsonObject, BiConsumer<String, String> directory, Consumer<Key> existing, Consumer<Key> included) {
JsonArray sources = atlasJsonObject.getAsJsonArray("sources");
if (sources != null) {
for (JsonElement source : sources) {
if (!(source instanceof JsonObject sourceJson)) continue;
String type = Optional.ofNullable(sourceJson.get("type")).map(JsonElement::getAsString).orElse(null);
if (type == null) continue;
switch (type) {
case "directory", "minecraft:directory" -> {
JsonElement source0 = sourceJson.get("source");
JsonElement prefix = sourceJson.get("prefix");
if (prefix == null || source0 == null) continue;
directory.accept(prefix.getAsString(), source0.getAsString() + "/");
}
case "single", "minecraft:single" -> {
JsonElement resource = sourceJson.get("resource");
if (resource == null) continue;
included.accept(Key.of(resource.getAsString()));
}
case "unstitch", "minecraft:unstitch" -> {
JsonElement resource = sourceJson.get("resource");
if (resource == null) continue;
included.accept(Key.of(resource.getAsString()));
JsonArray regions = sourceJson.getAsJsonArray("regions");
if (regions != null) {
for (JsonElement region : regions) {
if (!(region instanceof JsonObject regionJson)) continue;
JsonElement sprite = regionJson.get("sprite");
if (sprite == null) continue;
existing.accept(Key.of(sprite.getAsString()));
}
}
}
case "paletted_permutations", "minecraft:paletted_permutations" -> {
JsonArray textures = sourceJson.getAsJsonArray("textures");
if (textures == null) continue;
JsonObject permutationsJson = sourceJson.getAsJsonObject("permutations");
if (permutationsJson == null) continue;
String separator = sourceJson.has("separator") ? sourceJson.get("separator").getAsString() : "_";
List<String> permutations = new ArrayList<>(permutationsJson.keySet());
for (JsonElement texture : textures) {
if (!(texture instanceof JsonPrimitive texturePath)) continue;
for (String permutation : permutations) {
existing.accept(Key.of(texturePath.getAsString() + separator + permutation));
}
}
}
case "filter", "minecraft:filter" -> {
// todo filter
}
}
}
}
}
@SuppressWarnings("DuplicatedCode")
private void optimizeResourcePack(Path path) {
// 收集全部overlay
@@ -1903,7 +1848,7 @@ public abstract class AbstractPackManager implements PackManager {
}
// 经过这一步拿到的模型为包含全部父贴图的模型
private TexturedModel getTexturedModel(Key path, JsonObject modelJson, Path[] rootPaths, Map<Key, TexturedModel> models) {
public TexturedModel getTexturedModel(Key path, JsonObject modelJson, Path[] rootPaths, Map<Key, TexturedModel> models) {
TexturedModel texturedModel = new TexturedModel(modelJson);
if (modelJson.has("parent")) {
Key parentModelPath = Key.from(modelJson.get("parent").getAsString());
@@ -1949,47 +1894,6 @@ public abstract class AbstractPackManager implements PackManager {
return null;
}
private void verifyParentModelAndCollectTextures(Key rl,
JsonObject modelJson,
Path[] rootPaths,
Multimap<Key, Key> imageToModels,
Set<Key> checkedModels) {
// 如果有父模型
if (modelJson.has("parent")) {
Key parentRL = Key.from(modelJson.get("parent").getAsString());
if (checkedModels.add(parentRL) && !VANILLA_MODELS.contains(parentRL)) {
String parentModelPath = "assets/" + parentRL.namespace() + "/models/" + parentRL.value() + ".json";
label: {
for (Path rootPath : rootPaths) {
Path modelJsonPath = rootPath.resolve(parentModelPath);
if (Files.exists(modelJsonPath)) {
JsonObject jsonObject;
try {
jsonObject = GsonHelper.readJsonFile(modelJsonPath).getAsJsonObject();
} catch (IOException | JsonParseException e) {
TranslationManager.instance().log("warning.config.resource_pack.generation.malformatted_json", modelJsonPath.toAbsolutePath().toString());
break label;
}
verifyParentModelAndCollectTextures(parentRL, jsonObject, rootPaths, imageToModels, checkedModels);
break label;
}
}
TranslationManager.instance().log("warning.config.resource_pack.generation.missing_parent_model", rl.asString(), parentModelPath);
}
}
}
if (modelJson.has("textures")) {
JsonObject textures = modelJson.get("textures").getAsJsonObject();
for (Map.Entry<String, JsonElement> entry : textures.entrySet()) {
String value = entry.getValue().getAsString();
// fixme 应该报错，这个影响资源包加载
if (value.isEmpty() || value.charAt(0) == '#') continue;
Key textureResourceLocation = Key.from(value);
imageToModels.put(textureResourceLocation, rl);
}
}
}
private static void collectMultipart(JsonArray jsonArray, Consumer<Key> callback) {
for (JsonElement element : jsonArray) {
if (element instanceof JsonObject jo) {

32
core/src/main/java/net/momirealms/craftengine/core/pack/overlay/ResourcePackOverlay.java Normal file
View File

@@ -0,0 +1,32 @@
package net.momirealms.craftengine.core.pack.overlay;
import net.momirealms.craftengine.core.util.MinecraftVersion;
import java.nio.file.Path;
public class ResourcePackOverlay {
private final MinecraftVersion minVersion;
private final MinecraftVersion maxVersion;
private final Path folder;
public ResourcePackOverlay(MinecraftVersion minVersion,
MinecraftVersion maxVersion,
Path folder
) {
this.minVersion = minVersion;
this.maxVersion = maxVersion;
this.folder = folder;
}
public MinecraftVersion minVersion() {
return minVersion;
}
public MinecraftVersion maxVersion() {
return maxVersion;
}
public Path folder() {
return folder;
}
}

4
core/src/main/java/net/momirealms/craftengine/core/plugin/locale/LangData.java
View File

@@ -12,7 +12,7 @@ import java.util.function.Function;
public class LangData {
private static final Map<String, Function<String, List<String>>> LANG_KEY_PROCESSORS = new HashMap<>();
public Map<String, String> translations = new HashMap<>();
public Map<String, String> translations = new LinkedHashMap<>();
static {
LANG_KEY_PROCESSORS.put("block_name", (id) -> {
@@ -42,7 +42,7 @@ public class LangData {
}
public void processTranslations() {
Map<String, String> temp = new HashMap<>(Math.max(10, this.translations.size()));
Map<String, String> temp = new LinkedHashMap<>(Math.max(10, this.translations.size()));
for (Map.Entry<String, String> entry : this.translations.entrySet()) {
String key = entry.getKey();
String[] split = key.split(":", 2);