From 3c3f496015632ab84560be77a57cc57ac42c49e1 Mon Sep 17 00:00:00 2001 From: Owen Date: Wed, 19 Aug 2026 17:05:11 +0000 Subject: [PATCH] Fix BlockElements not properly saving forge_data when writing to json (#10877) --- .../models/block/test_forge_data.json | 68 +++++++++++++++++++ .../models/item/item_layers.json | 1 + .../client/model/generators/ModelBuilder.java | 4 ++ .../client/model/NewModelLoaderTest.java | 6 ++ 4 files changed, 79 insertions(+) create mode 100644 src/generated_test/resources/assets/new_model_loader_test/models/block/test_forge_data.json diff --git a/src/generated_test/resources/assets/new_model_loader_test/models/block/test_forge_data.json b/src/generated_test/resources/assets/new_model_loader_test/models/block/test_forge_data.json new file mode 100644 index 0000000000..7548d7831f --- /dev/null +++ b/src/generated_test/resources/assets/new_model_loader_test/models/block/test_forge_data.json @@ -0,0 +1,68 @@ +{ + "elements": [ + { + "faces": { + "down": { + "forge_data": { + "block_light": 10, + "sky_light": 10 + }, + "texture": "#all" + }, + "east": { + "forge_data": { + "block_light": 10, + "sky_light": 10 + }, + "texture": "#all" + }, + "north": { + "forge_data": { + "block_light": 10, + "sky_light": 10 + }, + "texture": "#all" + }, + "south": { + "forge_data": { + "block_light": 10, + "sky_light": 10 + }, + "texture": "#all" + }, + "up": { + "forge_data": { + "block_light": 10, + "sky_light": 10 + }, + "texture": "#all" + }, + "west": { + "forge_data": { + "block_light": 10, + "sky_light": 10 + }, + "texture": "#all" + } + }, + "forge_data": { + "block_light": 15, + "sky_light": 15 + }, + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ] + } + ], + "render_type": "minecraft:cutout", + "textures": { + "all": "minecraft:block/diamond_ore" + } +} \ No newline at end of file diff --git a/src/generated_test/resources/assets/new_model_loader_test/models/item/item_layers.json b/src/generated_test/resources/assets/new_model_loader_test/models/item/item_layers.json index 0b2d10f5b3..bb81a65197 100644 --- a/src/generated_test/resources/assets/new_model_loader_test/models/item/item_layers.json +++ b/src/generated_test/resources/assets/new_model_loader_test/models/item/item_layers.json @@ -10,6 +10,7 @@ }, "loader": "forge:item_layers", "render_types": {}, + "render_types_fast": {}, "textures": { "layer0": "minecraft:item/coal", "layer1": "minecraft:item/stick", diff --git a/src/main/java/net/minecraftforge/client/model/generators/ModelBuilder.java b/src/main/java/net/minecraftforge/client/model/generators/ModelBuilder.java index 4ea0987f36..ba397d0ff2 100644 --- a/src/main/java/net/minecraftforge/client/model/generators/ModelBuilder.java +++ b/src/main/java/net/minecraftforge/client/model/generators/ModelBuilder.java @@ -361,6 +361,10 @@ public class ModelBuilder> extends ModelFile { partObj.addProperty("shade", part.shade); } + if (!part.getFaceData().equals(ForgeFaceData.DEFAULT)) { + partObj.add("forge_data", ForgeFaceData.CODEC.encodeStart(JsonOps.INSTANCE, part.getFaceData()).result().get()); + } + JsonObject faces = new JsonObject(); for (Direction dir : Direction.values()) { BlockElementFace face = part.faces.get(dir); diff --git a/src/test/java/net/minecraftforge/debug/client/model/NewModelLoaderTest.java b/src/test/java/net/minecraftforge/debug/client/model/NewModelLoaderTest.java index f1bd5e461b..8d8ef56c03 100644 --- a/src/test/java/net/minecraftforge/debug/client/model/NewModelLoaderTest.java +++ b/src/test/java/net/minecraftforge/debug/client/model/NewModelLoaderTest.java @@ -247,6 +247,12 @@ public class NewModelLoaderTest .with(BlockStateProperties.HORIZONTAL_FACING, Direction.SOUTH) .addModels(new ConfiguredModel(model, 0, 180, false)) .partialState(); + models().getBuilder("test_forge_data") + .texture("all", mcLoc("block/diamond_ore")) + .element().from(0.0F, 0.0F, 0.0F).to(16.0F, 16.0F, 16.0F) + .allFaces((dir, face) -> face.texture("#all").emissivity(10, 10)) + .emissivity(15, 15).end() + .renderType("cutout"); } } }