Fix painting culling

Fixes: #399

Author: 1foxy2

common/src/main/java/ca/fxco/moreculling/api/renderers/ExtendedPaintingRenderState.java

@@ -0,0 +1,15 @@
+package ca.fxco.moreculling.api.renderers;
+
+import net.minecraft.core.BlockPos;
+
+public interface ExtendedPaintingRenderState {
+
+    default BlockPos[][] moreculling$getBlockPoses() {
+        return null;
+    }
+
+    default void moreculling$setBlockPos(BlockPos[][] pos) {
+
+    }
+
+}

common/src/main/java/ca/fxco/moreculling/mixin/renderers/PaintingRenderState_apiMixin.java

@@ -0,0 +1,23 @@
+package ca.fxco.moreculling.mixin.renderers;
+
+import ca.fxco.moreculling.api.renderers.ExtendedPaintingRenderState;
+import net.minecraft.client.renderer.entity.state.PaintingRenderState;
+import net.minecraft.core.BlockPos;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+
+@Mixin(PaintingRenderState.class)
+public class PaintingRenderState_apiMixin implements ExtendedPaintingRenderState {
+    @Unique
+    private BlockPos[][] moreculling$blockposes;
+
+    @Override
+    public BlockPos[][] moreculling$getBlockPoses() {
+        return moreculling$blockposes;
+    }
+
+    @Override
+    public void moreculling$setBlockPos(BlockPos[][] pos) {
+        moreculling$blockposes = pos;
+    }
+}

common/src/main/java/ca/fxco/moreculling/mixin/renderers/PaintingRenderer_faceCullingMixin.java

@@ -1,12 +1,14 @@
 package ca.fxco.moreculling.mixin.renderers;
 
 import ca.fxco.moreculling.MoreCulling;
+import ca.fxco.moreculling.api.renderers.ExtendedPaintingRenderState;
 import ca.fxco.moreculling.utils.CullingUtils;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
+import com.mojang.logging.LogUtils;
 import me.fallenbreath.conditionalmixin.api.annotation.Condition;
 import me.fallenbreath.conditionalmixin.api.annotation.Restriction;
 import net.minecraft.client.renderer.RenderType;
@@ -23,8 +25,7 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import static ca.fxco.moreculling.states.PaintingRendererStates.DIRECTION;
-import static ca.fxco.moreculling.states.PaintingRendererStates.PAINTING_POS;
+import java.util.Arrays;
 
 @Restriction(conflict = {
     @Condition("smoothmaps")
@@ -46,8 +47,7 @@ public abstract class PaintingRenderer_faceCullingMixin {
     private void moreculling$getPaintingPos(Painting painting, PaintingRenderState renderState, float partialTick,
                                             CallbackInfo ci, @Local(ordinal = 0) int width,
                                             @Local(ordinal = 1) int height) {
-        PAINTING_POS = new BlockPos[width][height];
-        DIRECTION = painting.getDirection();
+        ((ExtendedPaintingRenderState) renderState).moreculling$setBlockPos(new BlockPos[width][height]);
     }
 
     @WrapOperation(
@@ -58,23 +58,31 @@ public abstract class PaintingRenderer_faceCullingMixin {
                     target = "(III)Lnet/minecraft/core/BlockPos;")
     )
     private BlockPos moreculling$getPaintingPos(int x, int y, int z, Operation<BlockPos> original,
-                                                @Local(ordinal = 3) int width, @Local(ordinal = 2) int height) {
+                                                @Local(ordinal = 3) int width, @Local(ordinal = 2) int height,
+                                                @Local(argsOnly = true) PaintingRenderState renderState) {
         BlockPos pos = original.call(x, y, z);
-        PAINTING_POS[width][height] = pos;
+        ((ExtendedPaintingRenderState) renderState).moreculling$getBlockPoses()[width][height] = pos;
         return pos;
     }
 
-    @Inject(
-            method = "renderPainting",
+    @WrapOperation(
+            method = "submit(Lnet/minecraft/client/renderer/entity/state/PaintingRenderState;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/SubmitNodeCollector;Lnet/minecraft/client/renderer/state/CameraRenderState;)V",
             at = @At(
-                    value = "HEAD"
-            ),
-            cancellable = true
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/client/renderer/entity/PaintingRenderer;" +
+                            "renderPainting(Lcom/mojang/blaze3d/vertex/PoseStack;" +
+                            "Lnet/minecraft/client/renderer/SubmitNodeCollector;" +
+                            "Lnet/minecraft/client/renderer/RenderType;" +
+                            "[IIILnet/minecraft/client/renderer/texture/TextureAtlasSprite;" +
+                            "Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;)V"
+            )
     )
-    private void moreculling$cullFace(PoseStack poseStack, SubmitNodeCollector nodeCollector, RenderType renderType,
-                                      int[] lightCoords, int width, int height, TextureAtlasSprite variant,
-                                      TextureAtlasSprite paintingAtlas, CallbackInfo ci) {
+    private void moreculling$cullFace(PaintingRenderer instance, PoseStack poseStack, SubmitNodeCollector nodeCollector,
+                                      RenderType renderType, int[] lightCoords, int width, int height,
+                                      TextureAtlasSprite variant, TextureAtlasSprite paintingAtlas,
+                                      Operation<Void> original, PaintingRenderState paintingRenderState) {
         if (!MoreCulling.CONFIG.paintingCulling) {
+            original.call(instance, poseStack, nodeCollector, renderType, lightCoords, width, height, variant, paintingAtlas);
             return;
         }
         nodeCollector.submitCustomGeometry(poseStack, renderType, (pose, consumer) -> {
@@ -88,7 +96,7 @@ public abstract class PaintingRenderer_faceCullingMixin {
             float uY = paintingAtlas.getU(0.0625F);
             double d0 = 1.0 / (double) width;  // fast math
             double d1 = 1.0 / (double) height; // fast math
-            Direction opposite = DIRECTION.getOpposite();
+            Direction opposite = paintingRenderState.direction.getOpposite();
 
             for (int x = 0; x < width; x++) {
                 for (int y = 0; y < height; y++) {
@@ -109,7 +117,7 @@ public abstract class PaintingRenderer_faceCullingMixin {
                     this.vertex(pose, consumer, x1, y2, fU0, fV1, -0.03125F, 0, 0, -1, light);
                     this.vertex(pose, consumer, x2, y2, fU1, fV1, -0.03125F, 0, 0, -1, light);
 
-                    if (!CullingUtils.shouldCullPaintingBack(PAINTING_POS[x][y], opposite)) {
+                    if (!CullingUtils.shouldCullPaintingBack(((ExtendedPaintingRenderState) paintingRenderState).moreculling$getBlockPoses()[x][y], opposite)) {
                         //back
                         this.vertex(pose, consumer, x2, y2, u1, v0, 0.03125F, 0, 0, 1, light);
                         this.vertex(pose, consumer, x1, y2, u0, v0, 0.03125F, 0, 0, 1, light);
@@ -151,6 +159,5 @@ public abstract class PaintingRenderer_faceCullingMixin {
                 }
             }
         });
-        ci.cancel();
     }
 }

common/src/main/java/ca/fxco/moreculling/states/PaintingRendererStates.java

@@ -57,7 +57,8 @@
     "renderers.ItemStackRenderState_faceCullingMixin",
     "renderers.LayerRenderState_apiMixin",
     "renderers.ModelBlockRenderer_cullMixin",
-    "renderers.PaintingRenderer_faceCullingMixin"
+    "renderers.PaintingRenderer_faceCullingMixin",
+    "renderers.PaintingRenderState_apiMixin"
   ],
   "injectors": {
     "defaultRequire": 1

common/src/main/resources/moreculling.mixins.json

@@ -25,7 +25,7 @@ neoforge_loader_version_range=[21.9.0-beta,)
 fabric_loader_version=0.17.2
 
 # Mod Properties
-mod_version=1.5.0-beta.1
+mod_version=1.5.0-beta.2
 maven_group=ca.fxco.moreculling
 archives_base_name=moreculling
 license=GPL-3.0-only