port(26.1)!: fabric-renderer-api-v1

fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/api/client/model/loading/v1/ModelModifier.java

@@ -144,7 +144,7 @@ interface Context {
 
 			/**
 			 * The baker being used to bake this model. It can be used to
-			 * {@linkplain ModelBaker#getModel get resolved models} and {@linkplain ModelBaker#sprites get sprites}. Note
+			 * {@linkplain ModelBaker#getModel get resolved models} and {@linkplain ModelBaker#materials get materials}. Note
 			 * that retrieving a model which was not previously
 			 * {@linkplain ResolvableModel.Resolver#markDependency discovered} will log a warning and return the missing
 			 * model.
@@ -182,7 +182,7 @@ interface Context {
 
 			/**
 			 * The baker being used to bake this model. It can be used to
-			 * {@linkplain ModelBaker#getModel get resolved models} and {@linkplain ModelBaker#sprites get sprites}. Note
+			 * {@linkplain ModelBaker#getModel get resolved models} and {@linkplain ModelBaker#materials get materials}. Note
 			 * that retrieving a model which was not previously
 			 * {@linkplain ResolvableModel.Resolver#markDependency discovered} will log a warning and return the missing
 			 * model.

fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/api/client/model/loading/v1/SimpleUnbakedExtraModel.java

@@ -18,16 +18,22 @@
 
 import java.util.function.BiFunction;
 
+import net.minecraft.client.renderer.block.model.BakedQuad;
 import net.minecraft.client.renderer.block.model.BlockStateModel;
 import net.minecraft.client.renderer.block.model.SimpleModelWrapper;
 import net.minecraft.client.renderer.block.model.SingleVariant;
 import net.minecraft.client.renderer.block.model.TextureSlots;
 import net.minecraft.client.resources.model.BlockModelRotation;
 import net.minecraft.client.resources.model.ModelBaker;
 import net.minecraft.client.resources.model.ModelState;
+import net.minecraft.client.resources.model.QuadCollection;
 import net.minecraft.client.resources.model.ResolvedModel;
 import net.minecraft.resources.Identifier;
 
+import net.fabricmc.fabric.api.client.renderer.v1.model.MeshQuadCollection;
+import net.fabricmc.fabric.api.client.renderer.v1.model.ModelHelper;
+import net.fabricmc.fabric.api.client.renderer.v1.sprite.SpriteFinder;
+
 /**
  * A {@link UnbakedExtraModel} that loads a single model.
  *
@@ -76,10 +82,36 @@ public static SimpleUnbakedExtraModel<BlockStateModel> blockStateModel(Identifie
 	public static SimpleUnbakedExtraModel<BlockStateModel> blockStateModel(Identifier model, ModelState settings) {
 		return new SimpleUnbakedExtraModel<>(model, (baked, baker) -> {
 			TextureSlots textures = baked.getTopTextureSlots();
+			QuadCollection quads = baked.bakeTopGeometry(
+					textures,
+					baker,
+					settings
+			);
+
+			final boolean[] hasTranslucency = {false};
+
+			if (quads instanceof MeshQuadCollection meshQuads) {
+				meshQuads.getMesh().forEach(quad -> {
+					SpriteFinder spriteFinder = baker.materials().spriteFinder(quad.atlas());
+					hasTranslucency[0] |= ModelHelper.computeSpriteInfo(spriteFinder.find(quad), quad)
+							.layer()
+							.translucent();
+				});
+			} else {
+				// SimpleModelWrapper#bake does this as well
+				for (BakedQuad quad : quads.getAll()) {
+					if (quad.spriteInfo().layer().translucent()) {
+						hasTranslucency[0] = true;
+						break;
+					}
+				}
+			}
+
 			return new SingleVariant(new SimpleModelWrapper(
-					baked.bakeTopGeometry(textures, baker, settings),
+					quads,
 					baked.getTopAmbientOcclusion(),
-					baked.resolveParticleSprite(textures, baker)
+					baked.resolveParticleMaterial(textures, baker),
+					hasTranslucency[0]
 			));
 		});
 	}

fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/api/client/model/loading/v1/wrapper/WrapperBlockStateModel.java

@@ -23,7 +23,7 @@
 
 import net.minecraft.client.renderer.block.model.BlockModelPart;
 import net.minecraft.client.renderer.block.model.BlockStateModel;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.block.model.Material;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.util.RandomSource;
@@ -57,8 +57,8 @@ public List<BlockModelPart> collectParts(RandomSource random) {
 	}
 
 	@Override
-	public TextureAtlasSprite particleIcon() {
-		return wrapped.particleIcon();
+	public Material.Baked particleMaterial() {
+		return wrapped.particleMaterial();
 	}
 
 	@Override
@@ -73,7 +73,12 @@ public Object createGeometryKey(BlockAndTintGetter level, BlockPos pos, BlockSta
 	}
 
 	@Override
-	public TextureAtlasSprite particleIcon(BlockAndTintGetter level, BlockPos pos, BlockState state) {
-		return wrapped.particleIcon(level, pos, state);
+	public Material.Baked particleMaterial(BlockAndTintGetter level, BlockPos pos, BlockState state) {
+		return wrapped.particleMaterial(level, pos, state);
+	}
+
+	@Override
+	public boolean hasTranslucency() {
+		return wrapped.hasTranslucency();
 	}
 }

fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/impl/client/model/loading/CompositeBlockStateModelImpl.java

@@ -30,7 +30,7 @@
 
 import net.minecraft.client.renderer.block.model.BlockModelPart;
 import net.minecraft.client.renderer.block.model.BlockStateModel;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.block.model.Material;
 import net.minecraft.client.resources.model.ModelBaker;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -46,10 +46,22 @@ public class CompositeBlockStateModelImpl implements CompositeBlockStateModel {
 	private final BlockStateModel[] models;
 	@UnmodifiableView
 	private final List<BlockStateModel> modelsView;
+	private final boolean hasTranslucency;
 
 	public CompositeBlockStateModelImpl(BlockStateModel[] models) {
 		this.models = models;
 		modelsView = Arrays.asList(models);
+
+		boolean hasTranslucency = false;
+
+		for (BlockStateModel model : this.models) {
+			if (model.hasTranslucency()) {
+				hasTranslucency = true;
+				break;
+			}
+		}
+
+		this.hasTranslucency = hasTranslucency;
 	}
 
 	public static CompositeBlockStateModelImpl of(List<BlockStateModel> models) {
@@ -118,13 +130,18 @@ record Key(List<Object> subkeys) {
 	}
 
 	@Override
-	public TextureAtlasSprite particleIcon() {
-		return models[0].particleIcon();
+	public Material.Baked particleMaterial() {
+		return models[0].particleMaterial();
+	}
+
+	@Override
+	public boolean hasTranslucency() {
+		return this.hasTranslucency;
 	}
 
 	@Override
-	public TextureAtlasSprite particleIcon(BlockAndTintGetter level, BlockPos pos, BlockState state) {
-		return models[0].particleIcon(level, pos, state);
+	public Material.Baked particleMaterial(BlockAndTintGetter level, BlockPos pos, BlockState state) {
+		return models[0].particleMaterial(level, pos, state);
 	}
 
 	public record Unbaked(@Unmodifiable List<BlockStateModel.Unbaked> models) implements CompositeBlockStateModel.Unbaked {

fabric-model-loading-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/model/loading/BakedModelRenderLayer.java

@@ -50,7 +50,7 @@ public void submit(PoseStack poseStack, SubmitNodeCollector nodeCollector, int l
 		poseStack.translate(-0.5F, 0.75F + aboveHead, -0.5F);
 		// FIXME 1.21.9
 		// FabricBlockModelRenderer.render(matrices.peek(), RenderLayerHelper.entityDelegate(bufferSource), model, 1, 1, 1, light, OverlayTexture.DEFAULT_UV, EmptyBlockRenderView.INSTANCE, BlockPos.ORIGIN, Blocks.AIR.getDefaultState());
-		nodeCollector.order(0).submitBlockModel(poseStack, Sheets.cutoutBlockSheet(), model, 1, 1, 1, light, OverlayTexture.NO_OVERLAY, 0);
+		nodeCollector.order(0).submitBlockModel(poseStack, Sheets.cutoutBlockSheet(), model, -1, light, OverlayTexture.NO_OVERLAY, 0);
 		poseStack.popPose();
 	}
 }

fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/api/client/renderer/v1/Renderer.java

@@ -25,6 +25,7 @@
 import org.jspecify.annotations.Nullable;
 
 import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.block.BakedQuadOutput;
 import net.minecraft.client.renderer.block.BlockRenderDispatcher;
 import net.minecraft.client.renderer.block.ModelBlockRenderer;
 import net.minecraft.client.renderer.block.model.BlockStateModel;
@@ -43,7 +44,6 @@
 import net.fabricmc.fabric.api.client.renderer.v1.render.FabricBlockRenderDispatcher;
 import net.fabricmc.fabric.api.client.renderer.v1.render.FabricLayerRenderState;
 import net.fabricmc.fabric.api.client.renderer.v1.render.FabricModelBlockRenderer;
-import net.fabricmc.fabric.api.client.renderer.v1.render.ItemRenderTypeGetter;
 import net.fabricmc.fabric.impl.client.renderer.RendererManager;
 
 /**
@@ -55,15 +55,15 @@
  * {@link SectionCompiler} in vanilla; this code is not patched automatically. Renderers must also ensure that the
  * following vanilla methods support {@link BlockStateModel#emitQuads}; these methods are not patched automatically.
  *
- * <ul><li>{@link ModelBlockRenderer#renderModel(PoseStack.Pose, VertexConsumer, BlockStateModel, float, float, float, int, int)}
+ * <ul><li>{@link ModelBlockRenderer#renderModel(PoseStack.Pose, BakedQuadOutput, BlockStateModel, int, int, int)}
  *
  * <li>{@link BlockRenderDispatcher#renderBreakingTexture(BlockState, BlockPos, BlockAndTintGetter, PoseStack, VertexConsumer)}
  *
  * <li>{@link BlockRenderDispatcher#renderSingleBlock(BlockState, PoseStack, MultiBufferSource, int, int)}</ul>
  *
  * <p>All other places in vanilla code that invoke {@link BlockStateModel#collectParts(RandomSource, List)},
  * {@link BlockStateModel#collectParts(RandomSource)}, or
- * {@link ModelBlockRenderer#renderModel(PoseStack.Pose, VertexConsumer, BlockStateModel, float, float, float, int, int)}
+ * {@link ModelBlockRenderer#renderModel(PoseStack.Pose, BakedQuadOutput, BlockStateModel, int, int, int)}
  * are, where appropriate, patched automatically to invoke the corresponding method above or the corresponding method in
  * {@link FabricModelBlockRenderer} or {@link FabricBlockRenderDispatcher}.
  */
@@ -96,26 +96,26 @@ static Renderer get() {
 	void tesselateBlock(ModelBlockRenderer blockRenderer, BlockAndTintGetter level, BlockStateModel model, BlockState state, BlockPos pos, PoseStack poseStack, BlockMultiBufferSource bufferSource, @Nullable Predicate<ChunkSectionLayer> layerFilter, boolean cull, long seed, int overlay);
 
 	/**
-	 * @see FabricModelBlockRenderer#renderModel(PoseStack.Pose, BlockMultiBufferSource, Predicate, BlockStateModel, float, float, float, int, int, BlockAndTintGetter, BlockPos, BlockState)
+	 * @see FabricModelBlockRenderer#renderModel(PoseStack.Pose, BlockMultiBufferSource, Predicate, BlockStateModel, int, int, int, BlockAndTintGetter, BlockPos, BlockState)
 	 */
 	@ApiStatus.OverrideOnly
-	void renderModel(PoseStack.Pose pose, BlockMultiBufferSource bufferSource, @Nullable Predicate<ChunkSectionLayer> layerFilter, BlockStateModel model, float red, float green, float blue, int light, int overlay, BlockAndTintGetter level, BlockPos pos, BlockState state);
+	void renderModel(PoseStack.Pose pose, BlockMultiBufferSource bufferSource, @Nullable Predicate<ChunkSectionLayer> layerFilter, BlockStateModel model, int tint, int light, int overlay, BlockAndTintGetter level, BlockPos pos, BlockState state);
 
 	/**
-	 * @see FabricBlockRenderDispatcher#renderSingleBlock(BlockState, PoseStack, MultiBufferSource, Predicate, int, int, BlockAndTintGetter, BlockPos)
+	 * @see FabricBlockRenderDispatcher#renderBreakingTexture(BlockState, BlockPos, BlockAndTintGetter, PoseStack, VertexConsumer)
 	 */
 	@ApiStatus.OverrideOnly
-	void renderSingleBlock(BlockRenderDispatcher renderDispatcher, BlockState state, PoseStack poseStack, MultiBufferSource bufferSource, @Nullable Predicate<ChunkSectionLayer> layerFilter, int light, int overlay, BlockAndTintGetter level, BlockPos pos);
+	void renderBreakingTexture(BlockRenderDispatcher renderDispatcher, BlockState state, BlockPos pos, BlockAndTintGetter level, PoseStack poseStack, VertexConsumer vertexConsumer);
 
 	/**
-	 * @see FabricLayerRenderState#emitter()
+	 * @see FabricBlockRenderDispatcher#renderSingleBlock(BlockState, PoseStack, MultiBufferSource, Predicate, int, int, BlockAndTintGetter, BlockPos)
 	 */
 	@ApiStatus.OverrideOnly
-	QuadEmitter getLayerRenderStateEmitter(ItemStackRenderState.LayerRenderState layer);
+	void renderSingleBlock(BlockRenderDispatcher renderDispatcher, BlockState state, PoseStack poseStack, MultiBufferSource bufferSource, @Nullable Predicate<ChunkSectionLayer> layerFilter, int light, int overlay, BlockAndTintGetter level, BlockPos pos);
 
 	/**
-	 * @see FabricLayerRenderState#setRenderTypeGetter(ItemRenderTypeGetter)
+	 * @see FabricLayerRenderState#emitter()
 	 */
 	@ApiStatus.OverrideOnly
-	void setLayerRenderTypeGetter(ItemStackRenderState.LayerRenderState layer, ItemRenderTypeGetter renderTypeGetter);
+	QuadEmitter getLayerRenderStateEmitter(ItemStackRenderState.LayerRenderState layer);
 }

fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/api/client/renderer/v1/mesh/MutableQuadView.java

@@ -23,17 +23,17 @@
 import org.jspecify.annotations.Nullable;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.ItemBlockRenderTypes;
 import net.minecraft.client.renderer.block.model.BakedQuad;
 import net.minecraft.client.renderer.chunk.ChunkSectionLayer;
 import net.minecraft.client.renderer.item.ItemStackRenderState;
 import net.minecraft.client.renderer.rendertype.RenderType;
+import net.minecraft.client.renderer.texture.SpriteContents;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.state.BlockState;
 
-import net.fabricmc.fabric.api.client.renderer.v1.render.FabricLayerRenderState;
-import net.fabricmc.fabric.api.client.renderer.v1.render.ItemRenderTypeGetter;
+import net.fabricmc.fabric.api.client.renderer.v1.model.ModelHelper;
+import net.fabricmc.fabric.api.client.renderer.v1.sprite.SpriteFinder;
 import net.fabricmc.fabric.api.util.TriState;
 import net.fabricmc.fabric.impl.client.renderer.QuadSpriteBaker;
 
@@ -188,7 +188,7 @@ default MutableQuadView uv(int vertexIndex, Vector2fc uv) {
 	 */
 	default MutableQuadView spriteBake(TextureAtlasSprite sprite, int bakeFlags) {
 		QuadSpriteBaker.bakeSprite(this, sprite, bakeFlags);
-		QuadAtlas atlas = QuadAtlas.of(sprite.atlasLocation());
+		QuadAtlas atlas = QuadAtlas.ofLocation(sprite.atlasLocation());
 
 		if (atlas == null) {
 			atlas = QuadAtlas.BLOCK;
@@ -278,18 +278,65 @@ default MutableQuadView normal(int vertexIndex, Vector3fc normal) {
 	MutableQuadView cullFace(@Nullable Direction face);
 
 	/**
-	 * Controls how this quad's pixels should be blended with the scene.
+	 * Controls how this quad's pixels should be blended with the scene in block form.
 	 *
-	 * <p>If set to {@code null}, {@link ItemBlockRenderTypes#getChunkRenderType(BlockState)} will be used to retrieve
-	 * the {@linkplain ChunkSectionLayer chunk layer} in block contexts. Set to another value to override this behavior.
-	 *
-	 * <p>In block contexts, a non-null value will be used directly. In item contexts, any value will be converted to a
-	 * {@link RenderType} using {@link FabricLayerRenderState#setRenderTypeGetter(ItemRenderTypeGetter)}.
+	 * <p>If set to {@code null}, {@link ModelHelper#computeSpriteInfo(TextureAtlasSprite, QuadView)} will be used to retrieve
+	 * the {@linkplain ChunkSectionLayer chunk layer}. Set to another value to override this behavior.
 	 *
 	 * <p>The default value is {@code null}.
+	 *
+	 * <p>This property is respected only in block contexts. It will not have an effect in other contexts.
 	 */
 	MutableQuadView chunkLayer(@Nullable ChunkSectionLayer layer);
 
+	/**
+	 * When computing a value, this method also sets the {@link #chunkLayer()} value.
+	 *
+	 * @return this quad's {@link ChunkSectionLayer} or a default determined by the sprite's
+	 * {@linkplain SpriteContents#computeTransparency(float, float, float, float) transparency}.
+	 * @see #chunkLayer()
+	 */
+	default ChunkSectionLayer getOrResolveChunkLayer(SpriteFinder spriteFinder) {
+		if (chunkLayer() == null) {
+			ChunkSectionLayer layer = ModelHelper.computeSpriteInfo(spriteFinder.find(this), this)
+					.layer();
+			chunkLayer(layer);
+			return layer;
+		}
+
+		return chunkLayer();
+	}
+
+	/**
+	 * Controls how this quad should be rendered in item form.
+	 *
+	 * <p>If set to {@code null}, {@link ModelHelper#computeSpriteInfo(TextureAtlasSprite, QuadView)} will be used to retrieve
+	 * the {@linkplain RenderType item RenderType}. Set to another value to override this behavior.
+	 *
+	 * <p>The default value is {@code null}.
+	 *
+	 * <p>This property is respected only in item contexts. It will not have an effect in other contexts.
+	 */
+	MutableQuadView itemRenderType(@Nullable RenderType renderType);
+
+	/**
+	 * When computing a value, this method also sets the {@link #itemRenderType()} value.
+	 *
+	 * @return this quad's {@linkplain RenderType item RenderType} or a default determined by the sprite's
+	 * {@linkplain SpriteContents#computeTransparency(float, float, float, float) transparency}.
+	 * @see #itemRenderType()
+	 */
+	default RenderType getOrResolveItemRenderType(SpriteFinder spriteFinder) {
+		if (itemRenderType() == null) {
+			RenderType renderType = ModelHelper.computeSpriteInfo(spriteFinder.find(this), this)
+					.itemRenderType();
+			itemRenderType(renderType);
+			return renderType;
+		}
+
+		return itemRenderType();
+	}
+
 	/**
 	 * When true, this quad will be rendered at full brightness.
 	 * Lightmap values provided via {@link QuadEmitter#lightmap(int)} will be ignored.
@@ -358,7 +405,7 @@ default MutableQuadView normal(int vertexIndex, Vector3fc normal) {
 	 * Sets the {@linkplain QuadAtlas atlas texture} used by this quad.
 	 *
 	 * <p>In block contexts, this property must be {@link QuadAtlas#BLOCK}. In item contexts, this property will be
-	 * converted to a {@link RenderType} using {@link FabricLayerRenderState#setRenderTypeGetter(ItemRenderTypeGetter)}.
+	 * converted to a {@link RenderType} using {@link #getOrResolveItemRenderType(SpriteFinder)}.
 	 *
 	 * <p>The default value is {@link QuadAtlas#BLOCK}.
 	 *