From 6a4132f5b032489e2849ea0d7aeb33034ea73204 Mon Sep 17 00:00:00 2001 From: Bixilon Date: Tue, 23 Feb 2021 17:00:03 +0100 Subject: [PATCH] models: also generate parent models --- .../pixlyzer/generator/generators/ModelsGenerator.kt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/ModelsGenerator.kt b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/ModelsGenerator.kt index 41915c0..8842900 100644 --- a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/ModelsGenerator.kt +++ b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/ModelsGenerator.kt @@ -11,9 +11,17 @@ object ModelsGenerator : Generator( override fun generate() { for (model in MODELS_TO_GENERATE) { val resourceLocation = ResourceLocation(model) - - data.add(resourceLocation.toString(), Util.readJsonMinecraftResource("assets/${resourceLocation.namespace}/models/${resourceLocation.path}.json")) + loadModel(resourceLocation) } } + private fun loadModel(resourceLocation: ResourceLocation) { + val modelJson = Util.readJsonMinecraftResource("assets/${resourceLocation.namespace}/models/${resourceLocation.path}.json") + modelJson["parent"]?.let { + loadModel(ResourceLocation(it.asString)) + } + data.add(resourceLocation.toString(), Util.readJsonMinecraftResource("assets/${resourceLocation.namespace}/models/${resourceLocation.path}.json")) + + } + }