From dd990a4ed48c3906a540f58dab38901f0f5e8bae Mon Sep 17 00:00:00 2001 From: Aurora Date: Wed, 16 Jul 2025 15:19:20 +0100 Subject: [PATCH] Null check our assets, remove duplicate writing of entity.json --- .../converter/util/VanillaPackProvider.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/converter/src/main/java/org/geysermc/pack/converter/util/VanillaPackProvider.java b/converter/src/main/java/org/geysermc/pack/converter/util/VanillaPackProvider.java index d723322..fbaf831 100644 --- a/converter/src/main/java/org/geysermc/pack/converter/util/VanillaPackProvider.java +++ b/converter/src/main/java/org/geysermc/pack/converter/util/VanillaPackProvider.java @@ -132,8 +132,17 @@ public final class VanillaPackProvider { Files.createDirectories(builtinModelsDirectory); } - Files.write(builtinModelsDirectory.resolve("entity.json"), IOUtils.toByteArray(builtinEntity)); - Files.write(builtinModelsDirectory.resolve("generated.json"), IOUtils.toByteArray(builtinGenerated)); + if (builtinEntity != null) { + Files.write(builtinModelsDirectory.resolve("entity.json"), IOUtils.toByteArray(builtinEntity)); + } else { + log.error("`entity.json` was not found. Continuing without, issues may occur!"); + } + + if (builtinGenerated != null) { + Files.write(builtinModelsDirectory.resolve("generated.json"), IOUtils.toByteArray(builtinGenerated)); + } else { + log.error("`generated.json` was not found. Continuing without, issues may occur!"); + } try (Stream paths = Files.walk(rootPath)) { paths.forEach(path -> { @@ -190,11 +199,6 @@ public final class VanillaPackProvider { .formatted(bytes2, asset.getValue().hash)), rootPath.resolve("assets/" + asset.getKey()) ); - - Files.write( - rootPath.resolve("assets/" + asset.getKey()), - IOUtils.toByteArray(builtinEntity) - ); } }); }