From e0d2c68c5b55c4c5b862fc30b77b568522afc230 Mon Sep 17 00:00:00 2001 From: LexManos Date: Mon, 18 Nov 2024 12:30:22 -0800 Subject: [PATCH] Call IUnbakedGeometry.bake from BlockModel Closes #10178 --- .../block/model/BlockModel.java.patch | 10 +++++- .../model/geometry/UnbakedGeometryHelper.java | 33 ------------------- 2 files changed, 9 insertions(+), 34 deletions(-) diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/BlockModel.java.patch b/patches/minecraft/net/minecraft/client/renderer/block/model/BlockModel.java.patch index 4ee9a2633e..6fccdbb133 100644 --- a/patches/minecraft/net/minecraft/client/renderer/block/model/BlockModel.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/block/model/BlockModel.java.patch @@ -30,7 +30,7 @@ public boolean hasAmbientOcclusion() { if (this.hasAmbientOcclusion != null) { return this.hasAmbientOcclusion; -@@ -130,6 +_,10 @@ +@@ -130,12 +_,18 @@ throw new IllegalStateException("BlockModel parent has to be a block model."); } @@ -41,6 +41,14 @@ this.parent = blockmodel; } } + + @Override + public BakedModel bake(ModelBaker p_252120_, Function p_250023_, ModelState p_251130_) { ++ if (this.customData.getCustomGeometry() != null) ++ return this.customData.getCustomGeometry().bake(customData, p_252120_, p_250023_, p_251130_); + return this.bake(p_250023_, p_251130_, true); + } + @@ -229,7 +_,18 @@ ItemTransform itemtransform5 = this.getTransform(ItemDisplayContext.GUI); ItemTransform itemtransform6 = this.getTransform(ItemDisplayContext.GROUND); diff --git a/src/main/java/net/minecraftforge/client/model/geometry/UnbakedGeometryHelper.java b/src/main/java/net/minecraftforge/client/model/geometry/UnbakedGeometryHelper.java index 8cdbbd1780..46883b1af0 100644 --- a/src/main/java/net/minecraftforge/client/model/geometry/UnbakedGeometryHelper.java +++ b/src/main/java/net/minecraftforge/client/model/geometry/UnbakedGeometryHelper.java @@ -11,27 +11,20 @@ import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.BlockElement; import net.minecraft.client.renderer.block.model.BlockElementFace; import net.minecraft.client.renderer.block.model.BlockFaceUV; -import net.minecraft.client.renderer.block.model.BlockModel; import net.minecraft.client.renderer.block.model.FaceBakery; import net.minecraft.client.renderer.texture.MissingTextureAtlasSprite; import net.minecraft.client.renderer.texture.SpriteContents; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.model.BakedModel; -import net.minecraft.client.resources.model.BuiltInModel; import net.minecraft.client.resources.model.Material; -import net.minecraft.client.resources.model.ModelBaker; import net.minecraft.client.resources.model.ModelBakery; import net.minecraft.client.resources.model.ModelState; -import net.minecraft.client.resources.model.SpecialModels; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.inventory.InventoryMenu; -import net.minecraftforge.client.model.ElementsModel; import net.minecraftforge.client.model.IModelBuilder; import net.minecraftforge.client.model.IQuadTransformer; import net.minecraftforge.client.model.QuadTransformers; import net.minecraftforge.client.model.SimpleModelState; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; import org.joml.Vector3f; @@ -89,32 +82,6 @@ public class UnbakedGeometryHelper { return new Material(InventoryMenu.BLOCK_ATLAS, ResourceLocation.parse(tex)); } - /** - * Helper for baking {@link BlockModel} instances. Handles baking custom geometries and deferring item model baking. - */ - /* - @ApiStatus.Internal - public static BakedModel bake(BlockModel blockModel, ModelBaker modelBaker, BlockModel owner, Function spriteGetter, ModelState modelState, boolean guiLight3d) { - IUnbakedGeometry customModel = blockModel.customData.getCustomGeometry(); - if (customModel != null) - return customModel.bake(blockModel.customData, modelBaker, spriteGetter, modelState); - - // Handle vanilla item models here, since vanilla has a shortcut for them - if (blockModel.getRootModel() == SpecialModels.GENERATED_MARKER) - return ModelBakery.ITEM_MODEL_GENERATOR.generateBlockModel(spriteGetter, blockModel).bake(modelBaker, blockModel, spriteGetter, modelState, guiLight3d); - - if (blockModel.getRootModel() == SpecialModels.BLOCK_ENTITY_MARKER) { - var particleSprite = spriteGetter.apply(blockModel.getMaterial("particle")); - return new BuiltInModel(blockModel.getTransforms(), particleSprite, blockModel.getGuiLight().lightLikeBlock()); - } - - @SuppressWarnings("deprecation") - var elements = blockModel.getElements(); - var elementsModel = new ElementsModel(elements); - return elementsModel.bake(blockModel.customData, modelBaker, spriteGetter, modelState); - } - */ - /** * Creates a list of {@linkplain BlockElement block elements} in the shape of the specified sprite contents. * These can later be baked using the same, or another texture.