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

修复folia上初始化家具碰撞的问题

Browse Source
This commit is contained in:
XiaoMoMi
2025-06-20 00:18:56 +08:00
parent c069be10ae
commit 199d5f8157
7 changed files with 87 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -662,7 +662,7 @@ public abstract class AbstractPackManager implements PackManager {
JsonObject fontJson;
try {
fontJson = GsonHelper.readJsonFile(file).getAsJsonObject();
} catch (IOException | JsonSyntaxException e) {
} catch (IOException | JsonParseException e) {
TranslationManager.instance().log("warning.config.resource_pack.generation.malformatted_json", file.toAbsolutePath().toString());
return FileVisitResult.CONTINUE;
}
@@ -698,7 +698,7 @@ public abstract class AbstractPackManager implements PackManager {
JsonObject itemJson;
try {
itemJson = GsonHelper.readJsonFile(file).getAsJsonObject();
} catch (IOException | JsonSyntaxException e) {
} catch (IOException | JsonParseException e) {
TranslationManager.instance().log("warning.config.resource_pack.generation.malformatted_json", file.toAbsolutePath().toString());
return FileVisitResult.CONTINUE;
}
@@ -723,7 +723,7 @@ public abstract class AbstractPackManager implements PackManager {
JsonObject blockStateJson;
try {
blockStateJson = GsonHelper.readJsonFile(file).getAsJsonObject();
} catch (IOException | JsonSyntaxException e) {
} catch (IOException | JsonParseException e) {
TranslationManager.instance().log("warning.config.resource_pack.generation.malformatted_json", file.toAbsolutePath().toString());
return FileVisitResult.CONTINUE;
}
@@ -764,7 +764,7 @@ public abstract class AbstractPackManager implements PackManager {
JsonObject jsonObject;
try {
jsonObject = GsonHelper.readJsonFile(modelJsonPath).getAsJsonObject();
} catch (IOException | JsonSyntaxException e) {
} catch (IOException | JsonParseException e) {
TranslationManager.instance().log("warning.config.resource_pack.generation.malformatted_json", modelJsonPath.toAbsolutePath().toString());
continue;
}
@@ -785,7 +785,7 @@ public abstract class AbstractPackManager implements PackManager {
JsonObject jsonObject;
try {
jsonObject = GsonHelper.readJsonFile(modelJsonPath).getAsJsonObject();
} catch (IOException | JsonSyntaxException e) {
} catch (IOException | JsonParseException e) {
TranslationManager.instance().log("warning.config.resource_pack.generation.malformatted_json", modelJsonPath.toAbsolutePath().toString());
continue;
}
@@ -821,7 +821,7 @@ public abstract class AbstractPackManager implements PackManager {
JsonObject jsonObject;
try {
jsonObject = GsonHelper.readJsonFile(modelJsonPath).getAsJsonObject();
} catch (IOException | JsonSyntaxException e) {
} catch (IOException | JsonParseException e) {
TranslationManager.instance().log("warning.config.resource_pack.generation.malformatted_json", modelJsonPath.toAbsolutePath().toString());
break label;
}

2
core/src/main/java/net/momirealms/craftengine/core/util/GsonHelper.java
View File

@@ -38,7 +38,7 @@ public class GsonHelper {
}
}
public static JsonElement readJsonFile(Path path) throws IOException, JsonSyntaxException {
public static JsonElement readJsonFile(Path path) throws IOException, JsonParseException {
try (BufferedReader reader = Files.newBufferedReader(path)) {
return JsonParser.parseReader(reader);
}