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

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

@@ -18,13 +18,15 @@
 
 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;
 
@@ -76,10 +78,27 @@ 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
+			);
+
+			boolean hasTranslucency = false;
+
+			// SimpleModelWrapper#bake does this as well
+			for (BakedQuad quad : quads.getAll()) {
+				if (quad.spriteInfo().layer().translucent()) {
+					hasTranslucency = true;
+					break;
+				}
+			}
+
 			return new SingleVariant(new SimpleModelWrapper(
-					baked.bakeTopGeometry(textures, baker, settings),
+					quads,
 					baked.getTopAmbientOcclusion(),
-					baked.resolveParticleSprite(textures, baker)
+					baked.resolveParticleMaterial(textures, baker),
+					hasTranslucency
 			));
 		});
 	}

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

@@ -43,7 +43,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;
 
 /**
@@ -99,7 +98,7 @@ static Renderer get() {
 	 * @see FabricModelBlockRenderer#renderModel(PoseStack.Pose, BlockMultiBufferSource, Predicate, BlockStateModel, float, float, float, 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)
@@ -112,10 +111,4 @@ static Renderer get() {
 	 */
 	@ApiStatus.OverrideOnly
 	QuadEmitter getLayerRenderStateEmitter(ItemStackRenderState.LayerRenderState layer);
-
-	/**
-	 * @see FabricLayerRenderState#setRenderTypeGetter(ItemRenderTypeGetter)
-	 */
-	@ApiStatus.OverrideOnly
-	void setLayerRenderTypeGetter(ItemStackRenderState.LayerRenderState layer, ItemRenderTypeGetter renderTypeGetter);
 }

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

@@ -23,7 +23,6 @@
 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;
@@ -32,8 +31,8 @@
 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 +187,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 +277,25 @@ 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#getSpriteInfo(TextureAtlasSprite)} 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}.
 	 */
 	MutableQuadView chunkLayer(@Nullable ChunkSectionLayer layer);
 
+	/**
+	 * Controls how this quad should be rendered in item form.
+	 *
+	 * <p>If set to {@code null}, {@link ModelHelper#getSpriteInfo(TextureAtlasSprite)} 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}.
+	 */
+	MutableQuadView itemRenderType(@Nullable RenderType renderType);
+
 	/**
 	 * When true, this quad will be rendered at full brightness.
 	 * Lightmap values provided via {@link QuadEmitter#lightmap(int)} will be ignored.
@@ -358,7 +364,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 #itemRenderTypeOrDefault(SpriteFinder)}.
 	 *
 	 * <p>The default value is {@link QuadAtlas#BLOCK}.
 	 *

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

@@ -19,39 +19,63 @@
 import org.jspecify.annotations.Nullable;
 
 import net.minecraft.client.renderer.texture.TextureAtlas;
+import net.minecraft.data.AtlasIds;
 import net.minecraft.resources.Identifier;
 
 /**
  * An atlas texture that a {@link QuadView} uses.
  */
 public enum QuadAtlas {
-	BLOCK(TextureAtlas.LOCATION_BLOCKS),
-	ITEM(TextureAtlas.LOCATION_ITEMS);
+	BLOCK(TextureAtlas.LOCATION_BLOCKS, AtlasIds.BLOCKS),
+	ITEM(TextureAtlas.LOCATION_ITEMS, AtlasIds.ITEMS);
 
-	private final Identifier textureId;
+	private final Identifier textureLocation;
+	private final Identifier id;
 
-	QuadAtlas(Identifier textureId) {
-		this.textureId = textureId;
+	QuadAtlas(Identifier textureLocation, Identifier id) {
+		this.textureLocation = textureLocation;
+		this.id = id;
 	}
 
 	/**
-	 * {@return the quad atlas for the given atlas texture ID or null if no corresponding quad atlas exists}
+	 * {@return the quad atlas for the given atlas texture location or null if no corresponding quad atlas exists}
 	 */
 	@Nullable
-	public static QuadAtlas of(Identifier atlasTextureId) {
-		if (atlasTextureId.equals(TextureAtlas.LOCATION_BLOCKS)) {
+	public static QuadAtlas ofLocation(Identifier atlasTextureLocation) {
+		if (atlasTextureLocation.equals(TextureAtlas.LOCATION_BLOCKS)) {
 			return BLOCK;
-		} else if (atlasTextureId.equals(TextureAtlas.LOCATION_ITEMS)) {
+		} else if (atlasTextureLocation.equals(TextureAtlas.LOCATION_ITEMS)) {
 			return ITEM;
 		} else {
 			return null;
 		}
 	}
 
 	/**
-	 * {@return the atlas texture ID}
+	 * {@return the quad atlas for the given atlas ID or null if no corresponding quad atlas exists}
 	 */
-	public Identifier getTextureId() {
-		return textureId;
+	@Nullable
+	public static QuadAtlas ofId(Identifier atlasId) {
+		if (atlasId.equals(AtlasIds.BLOCKS)) {
+			return BLOCK;
+		} else if (atlasId.equals(AtlasIds.ITEMS)) {
+			return ITEM;
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * @return the atlas texture location (ends with {@code .png})
+	 */
+	public Identifier getTextureLocation() {
+		return textureLocation;
+	}
+
+	/**
+	 * @return the atlas ID
+	 */
+	public Identifier getId() {
+		return id;
 	}
 }

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

@@ -25,6 +25,7 @@
 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.TextureAtlasSprite;
 import net.minecraft.core.Direction;
 
@@ -126,6 +127,9 @@ default QuadEmitter normal(int vertexIndex, Vector3fc normal) {
 	@Override
 	QuadEmitter chunkLayer(@Nullable ChunkSectionLayer layer);
 
+	@Override
+	QuadEmitter itemRenderType(@Nullable RenderType renderType);
+
 	@Override
 	QuadEmitter emissive(boolean emissive);