FRAPI improvements: context getters, full removal of fallback consumers, small enhancements

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

@@ -23,13 +23,16 @@
 
 import net.minecraft.block.BlockState;
 import net.minecraft.client.render.model.BakedModel;
+import net.minecraft.client.render.model.json.ModelTransformationMode;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
 import net.minecraft.world.BlockRenderView;
 
 import net.fabricmc.fabric.api.renderer.v1.mesh.Mesh;
 import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView;
 import net.fabricmc.fabric.api.renderer.v1.mesh.QuadEmitter;
+import net.fabricmc.fabric.api.renderer.v1.mesh.QuadView;
 import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel;
 
 /**
@@ -54,6 +57,15 @@ public interface RenderContext {
 	 */
 	QuadEmitter getEmitter();
 
+	/**
+	 * Returns whether this context currently has at least one transform.
+	 *
+	 * @apiNote The default implementation will be removed in the next breaking release.
+	 */
+	default boolean hasTransform() {
+		return true;
+	}
+
 	/**
 	 * Causes all models/quads/meshes sent to this consumer to be transformed by the provided
 	 * {@link QuadTransform} that edits each quad before buffering. Quads in the mesh will
@@ -76,6 +88,34 @@ public interface RenderContext {
 	 */
 	void popTransform();
 
+	/**
+	 * Returns {@code true} if the given face will be culled away.
+	 *
+	 * <p>This function can be used to avoid complex transformations of quads that will be culled anyway.
+	 * The cull face of a quad is determined by {@link QuadView#cullFace()}.
+	 *
+	 * <p>This function can only be used on a block render context (i.e. in {@link FabricBakedModel#emitBlockQuads}).
+	 * Calling it on another context (e.g. in {@link FabricBakedModel#emitItemQuads}) will throw an exception.
+	 *
+	 * @apiNote The default implementation will be removed in the next breaking release.
+	 */
+	// TODO: allow null params?
+	default boolean isFaceCulled(Direction face) {
+		return false;
+	}
+
+	/**
+	 * Returns the current transformation mode.
+	 *
+	 * <p>This function can only be used on an item render context (i.e. in {@link FabricBakedModel#emitItemQuads}).
+	 * Calling it on another context (e.g. in {@link FabricBakedModel#emitBlockQuads}) will throw an exception.
+	 *
+	 * @apiNote The default implementation will be removed in the next breaking release.
+	 */
+	default ModelTransformationMode itemTransformationMode() {
+		return ModelTransformationMode.NONE;
+	}
+
 	@FunctionalInterface
 	interface QuadTransform {
 		/**
@@ -89,7 +129,9 @@ interface QuadTransform {
 	 * @deprecated Use {@link Mesh#outputTo(QuadEmitter)} instead.
 	 */
 	@Deprecated
-	Consumer<Mesh> meshConsumer();
+	default Consumer<Mesh> meshConsumer() {
+		return mesh -> mesh.outputTo(getEmitter());
+	}
 
 	/**
 	 * @deprecated Use {@link FabricBakedModel#emitBlockQuads(BlockRenderView, BlockState, BlockPos, Supplier, RenderContext) emitBlockQuads}

fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/renderer/render/AbstractBlockRenderContext.java

@@ -31,6 +31,7 @@
 import net.minecraft.client.render.WorldRenderer;
 import net.minecraft.client.render.model.BakedModel;
 import net.minecraft.client.render.model.BakedQuad;
+import net.minecraft.client.render.model.json.ModelTransformationMode;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 
@@ -80,6 +81,16 @@ public QuadEmitter getEmitter() {
 		return editorQuad;
 	}
 
+	@Override
+	public boolean isFaceCulled(Direction face) {
+		return !blockInfo.shouldDrawFace(face);
+	}
+
+	@Override
+	public ModelTransformationMode itemTransformationMode() {
+		throw new IllegalStateException("itemTransformationMode() can only be called on an item render context.");
+	}
+
 	@Override
 	public BakedModelConsumer bakedModelConsumer() {
 		return vanillaModelConsumer;
@@ -90,7 +101,7 @@ private void renderQuad(MutableQuadViewImpl quad, boolean isVanilla) {
 			return;
 		}
 
-		if (!blockInfo.shouldDrawFace(quad.cullFace())) {
+		if (isFaceCulled(quad.cullFace())) {
 			return;
 		}
 

fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/renderer/render/AbstractRenderContext.java

@@ -61,7 +61,8 @@ protected final boolean transform(MutableQuadView q) {
 		return activeTransform.transform(q);
 	}
 
-	protected boolean hasTransform() {
+	@Override
+	public boolean hasTransform() {
 		return activeTransform != NO_TRANSFORM;
 	}
 

fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/renderer/render/ItemRenderContext.java

@@ -106,6 +106,16 @@ public QuadEmitter getEmitter() {
 		return editorQuad;
 	}
 
+	@Override
+	public boolean isFaceCulled(Direction face) {
+		throw new IllegalStateException("isFaceCulled can only be called on a block render context.");
+	}
+
+	@Override
+	public ModelTransformationMode itemTransformationMode() {
+		return transformMode;
+	}
+
 	@Override
 	public BakedModelConsumer bakedModelConsumer() {
 		return vanillaModelConsumer;