Fix quad culling of 2D items that have been rotated

Author: mezz

Common/src/main/java/mezz/jei/common/util/QuadUtil.java

@@ -0,0 +1,34 @@
+package mezz.jei.common.util;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.core.Direction;
+import org.joml.Matrix4f;
+import org.joml.Vector3f;
+
+import java.util.List;
+
+public final class QuadUtil {
+	private QuadUtil() {}
+
+	public static List<BakedQuad> getQuadsFacingDirection(List<BakedQuad> quads, PoseStack poseStack, Direction facing) {
+		Matrix4f pose = poseStack.last().pose();
+
+		Direction.Axis axis = facing.getAxis();
+		float facingStep = facing.getAxisDirection().getStep();
+
+		return quads
+			.stream()
+			.filter(q -> {
+				Direction quadDirection = q.getDirection();
+				Vector3f transformedDirection = pose.transformDirection(quadDirection.step());
+				double value = axis.choose(transformedDirection.x, transformedDirection.y, transformedDirection.z);
+				if (facingStep > 0) {
+					return value > 0;
+				} else {
+					return value < 0;
+				}
+			})
+			.toList();
+	}
+}

Fabric/src/main/java/mezz/jei/fabric/platform/FabricLimitedQuadItemModel.java

@@ -1,10 +1,14 @@
 package mezz.jei.fabric.platform;
 
+import com.mojang.blaze3d.vertex.PoseStack;
+import mezz.jei.common.util.QuadUtil;
 import net.fabricmc.fabric.api.renderer.v1.model.ForwardingBakedModel;
 import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.renderer.block.model.ItemTransform;
 import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.core.Direction;
 import net.minecraft.util.RandomSource;
+import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.level.block.state.BlockState;
 import org.jetbrains.annotations.Nullable;
 
@@ -28,10 +32,17 @@ private FabricLimitedQuadItemModel(BakedModel model) {
 	public List<BakedQuad> getQuads(BlockState blockState, @Nullable Direction face, RandomSource rand) {
 		if (face == null) {
 			if (quads == null) {
-				quads = wrapped.getQuads(blockState, null, rand)
-					.stream()
-					.filter(q -> q.getDirection() == Direction.SOUTH)
-					.toList();
+				List<BakedQuad> originalQuads = wrapped.getQuads(blockState, null, rand);
+
+				PoseStack poseStack = new PoseStack();
+
+				ItemTransform guiTransform = wrapped.getTransforms().getTransform(ItemDisplayContext.GUI);
+				guiTransform.apply(false, poseStack);
+
+				quads = QuadUtil.getQuadsFacingDirection(originalQuads, poseStack, Direction.SOUTH);
+				if (quads.isEmpty()) {
+					quads = originalQuads;
+				}
 			}
 			return quads;
 		}

Forge/src/main/java/mezz/jei/forge/platform/ForgeLimitedQuadItemModel.java

@@ -1,6 +1,7 @@
 package mezz.jei.forge.platform;
 
 import com.mojang.blaze3d.vertex.PoseStack;
+import mezz.jei.common.util.QuadUtil;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.block.model.BakedQuad;
 import net.minecraft.client.resources.model.BakedModel;
@@ -36,10 +37,21 @@ private ForgeLimitedQuadItemModel(BakedModel originalModel) {
 	public List<BakedQuad> getQuads(@Nullable BlockState blockState, @Nullable Direction direction, RandomSource randomSource) {
 		if (direction == null) {
 			if (quads == null) {
-				quads = originalModel.getQuads(blockState, null, randomSource)
-					.stream()
-					.filter(q -> q.getDirection() == Direction.SOUTH)
-					.toList();
+				List<BakedQuad> originalQuads = originalModel.getQuads(blockState, null, randomSource);
+
+				PoseStack poseStack = new PoseStack();
+
+				BakedModel bakedModel = originalModel.applyTransform(ItemDisplayContext.GUI, poseStack, false);
+				if (bakedModel != originalModel) {
+					// this shouldn't be possible because we don't wrap IDynamicBakedModels
+					// we can't easily understand which way the quads will face in this case, so don't cull or cache any quads
+					return originalQuads;
+				}
+
+				quads = QuadUtil.getQuadsFacingDirection(originalQuads, poseStack, Direction.SOUTH);
+				if (quads.isEmpty()) {
+					quads = originalQuads;
+				}
 			}
 			return quads;
 		}

NeoForge/src/main/java/mezz/jei/neoforge/platform/NeoForgeLimitedQuadItemModel.java

@@ -1,6 +1,7 @@
 package mezz.jei.neoforge.platform;
 
 import com.mojang.blaze3d.vertex.PoseStack;
+import mezz.jei.common.util.QuadUtil;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.block.model.BakedQuad;
 import net.minecraft.client.resources.model.BakedModel;
@@ -36,24 +37,46 @@ private NeoForgeLimitedQuadItemModel(BakedModel originalModel) {
 	public List<BakedQuad> getQuads(@Nullable BlockState blockState, @Nullable Direction direction, RandomSource randomSource) {
 		if (direction == null) {
 			if (quads == null) {
-				quads = originalModel.getQuads(blockState, null, randomSource)
-					.stream()
-					.filter(q -> q.getDirection() == Direction.SOUTH)
-					.toList();
+				List<BakedQuad> originalQuads = originalModel.getQuads(blockState, null, randomSource);
+
+				PoseStack poseStack = new PoseStack();
+
+				BakedModel bakedModel = originalModel.applyTransform(ItemDisplayContext.GUI, poseStack, false);
+				if (bakedModel != originalModel) {
+					// this shouldn't be possible because we don't wrap IDynamicBakedModels
+					// we can't easily understand which way the quads will face in this case, so don't cull or cache any quads
+					return originalQuads;
+				}
+
+				quads = QuadUtil.getQuadsFacingDirection(originalQuads, poseStack, Direction.SOUTH);
+				if (quads.isEmpty()) {
+					quads = originalQuads;
+				}
 			}
 			return quads;
 		}
-		return List.of();
+		return originalModel.getQuads(blockState, direction, randomSource);
 	}
 
 	@Override
 	public List<BakedQuad> getQuads(@Nullable BlockState blockState, @Nullable Direction direction, RandomSource randomSource, ModelData extraData, @Nullable RenderType renderType) {
 		if (direction == null) {
 			if (quads == null) {
-				quads = originalModel.getQuads(blockState, null, randomSource, extraData, renderType)
-					.stream()
-					.filter(q -> q.getDirection() == Direction.SOUTH)
-					.toList();
+				List<BakedQuad> originalQuads = originalModel.getQuads(blockState, null, randomSource, extraData, renderType);
+
+				PoseStack poseStack = new PoseStack();
+
+				BakedModel bakedModel = originalModel.applyTransform(ItemDisplayContext.GUI, poseStack, false);
+				if (bakedModel != originalModel) {
+					// this shouldn't be possible because we don't wrap IDynamicBakedModels
+					// we can't easily understand which way the quads will face in this case, so don't cull or cache any quads
+					return originalQuads;
+				}
+
+				quads = QuadUtil.getQuadsFacingDirection(originalQuads, poseStack, Direction.SOUTH);
+				if (quads.isEmpty()) {
+					quads = originalQuads;
+				}
 			}
 			return quads;
 		}

NeoForge/src/main/java/mezz/jei/neoforge/platform/RenderHelper.java

@@ -18,7 +18,6 @@
 import net.minecraft.world.item.ItemStack;
 import net.neoforged.neoforge.client.extensions.common.IClientItemExtensions;
 import net.neoforged.neoforge.client.extensions.common.IClientMobEffectExtensions;
-import net.neoforged.neoforge.client.model.IDynamicBakedModel;
 import net.neoforged.neoforge.client.model.data.ModelData;
 import net.neoforged.neoforge.common.Tags;