diff --git a/src/main/java/net/neoforged/neoforge/client/model/generators/loaders/CompositeModelBuilder.java b/src/main/java/net/neoforged/neoforge/client/model/generators/loaders/CompositeModelBuilder.java index 75a47b2a077..ca040abe32f 100644 --- a/src/main/java/net/neoforged/neoforge/client/model/generators/loaders/CompositeModelBuilder.java +++ b/src/main/java/net/neoforged/neoforge/client/model/generators/loaders/CompositeModelBuilder.java @@ -16,6 +16,7 @@ import net.minecraft.resources.ResourceLocation; import net.neoforged.neoforge.client.model.generators.CustomLoaderBuilder; import net.neoforged.neoforge.client.model.generators.ModelBuilder; +import net.neoforged.neoforge.client.model.generators.ModelFile; import net.neoforged.neoforge.common.data.ExistingFileHelper; public class CompositeModelBuilder> extends CustomLoaderBuilder { @@ -23,17 +24,17 @@ public static > CompositeModelBuilder begin(T paren return new CompositeModelBuilder<>(parent, existingFileHelper); } - private final Map childModels = new LinkedHashMap<>(); + private final Map childModels = new LinkedHashMap<>(); private final List itemRenderOrder = new ArrayList<>(); protected CompositeModelBuilder(T parent, ExistingFileHelper existingFileHelper) { super(ResourceLocation.fromNamespaceAndPath("neoforge", "composite"), parent, existingFileHelper, false); } - public CompositeModelBuilder child(String name, T modelBuilder) { + public CompositeModelBuilder child(String name, ModelFile model) { Preconditions.checkNotNull(name, "name must not be null"); - Preconditions.checkNotNull(modelBuilder, "modelBuilder must not be null"); - childModels.put(name, modelBuilder); + Preconditions.checkNotNull(model, "model must not be null"); + childModels.put(name, model.getLocation()); itemRenderOrder.add(name); return this; } @@ -54,8 +55,8 @@ public JsonObject toJson(JsonObject json) { json = super.toJson(json); JsonObject children = new JsonObject(); - for (Map.Entry entry : childModels.entrySet()) { - children.add(entry.getKey(), entry.getValue().toJson()); + for (Map.Entry entry : childModels.entrySet()) { + children.addProperty(entry.getKey(), entry.getValue().toString()); } json.add("children", children);