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

Update AbstractPackManager.java

Browse Source
This commit is contained in:
XiaoMoMi
2025-07-01 03:05:20 +08:00
parent 2db43db95e
commit e4ec3f2795
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -940,7 +940,7 @@ public abstract class AbstractPackManager implements PackManager {
// 验证物品模型是否存在，验证的同时去收集贴图
label: for (Map.Entry<Key, Collection<Key>> entry : modelToItems.asMap().entrySet()) {
Key modelResourceLocation = entry.getKey();
boolean alreadyChecked = collectedModels.add(modelResourceLocation);
boolean alreadyChecked = !collectedModels.add(modelResourceLocation);
if (alreadyChecked || VANILLA_MODELS.contains(modelResourceLocation)) continue;
String modelPath = "assets/" + modelResourceLocation.namespace() + "/models/" + modelResourceLocation.value() + ".json";
for (Path rootPath : rootPaths) {
@@ -962,9 +962,10 @@ public abstract class AbstractPackManager implements PackManager {
// 验证方块模型是否存在，验证的同时去收集贴图
label: for (Map.Entry<Key, Collection<String>> entry : modelToBlocks.asMap().entrySet()) {
Key key = entry.getKey();
String modelPath = "assets/" + key.namespace() + "/models/" + key.value() + ".json";
if (VANILLA_MODELS.contains(key)) continue;
Key modelResourceLocation = entry.getKey();
boolean alreadyChecked = !collectedModels.add(modelResourceLocation);
if (alreadyChecked || VANILLA_MODELS.contains(modelResourceLocation)) continue;
String modelPath = "assets/" + modelResourceLocation.namespace() + "/models/" + modelResourceLocation.value() + ".json";
for (Path rootPath : rootPaths) {
Path modelJsonPath = rootPath.resolve(modelPath);
if (Files.exists(modelJsonPath)) {
@@ -975,7 +976,7 @@ public abstract class AbstractPackManager implements PackManager {
TranslationManager.instance().log("warning.config.resource_pack.generation.malformatted_json", modelJsonPath.toAbsolutePath().toString());
continue;
}
verifyParentModelAndCollectTextures(key, jsonObject, rootPaths, imageToModels, collectedModels);
verifyParentModelAndCollectTextures(modelResourceLocation, jsonObject, rootPaths, imageToModels, collectedModels);
continue label;
}
}