consistent fix for the Z fighting bug

Author: FalsePattern

build.gradle.kts

@@ -82,9 +82,6 @@ dependencies {
 
     compileOnly(deobfCurse("redstone-paste-67508:2211249"))
 
-    //V33a
-    compileOnly(deobfCurse("chromaticraft-235590:4721192"))
-
     //V33b
     compileOnly(deobfCurse("dragonapi-235591:4722480"))
 

src/main/java/com/falsepattern/falsetweaks/mixin/mixins/client/triangulator/RenderBlocksUltraMixin.java

@@ -123,8 +123,13 @@ public abstract class RenderBlocksUltraMixin implements IRenderBlocksMixin {
     private Vector3ic frontDir;
     private boolean[] states;
     private double[] bounds;
-    @Setter
-    private boolean reusePreviousStates;
+    private boolean[] reusePreviousStates;
+
+    @Override
+    public void reusePreviousStates(boolean state) {
+        Arrays.fill(reusePreviousStates, state);
+    }
+
     @Setter
     private boolean enableMultiRenderReuse;
     private boolean disableCrackFix;
@@ -586,9 +591,6 @@ public boolean renderWithAO(Block block, int x, int y, int z, float r, float g,
         drewSomething |= renderFace(Facing.XPOS);
 
         this.enableAO = false;
-        if (drewSomething && enableMultiRenderReuse) {
-            reusePreviousStates = true;
-        }
         return drewSomething;
     }
 
@@ -597,18 +599,23 @@ public boolean renderWithAO(Block block, int x, int y, int z, float r, float g,
             require = 2)
     private void setupStates(CallbackInfo ci) {
         states = new boolean[6];
+        reusePreviousStates = new boolean[6];
     }
 
     private void reuse(Facing.Direction dir) {
-        if (reusePreviousStates) {
-            ((ITriangulatorTessellator) Compat.tessellator()).alternativeTriangulation(states[dir.ordinal()]);
+        val ord = dir.ordinal();
+        if (reusePreviousStates[ord]) {
+            ((ITriangulatorTessellator) Compat.tessellator()).alternativeTriangulation(states[ord]);
         } else {
             states[dir.ordinal()] = ((ITriangulatorTessellator) Compat.tessellator()).alternativeTriangulation();
         }
+        if (enableMultiRenderReuse) {
+            reusePreviousStates[ord] = true;
+        }
     }
 
-    private void aoFix() {
-        if (reusePreviousStates) {
+    private void aoFix(Facing.Direction dir) {
+        if (reusePreviousStates[dir.ordinal()]) {
             return;
         }
         var avgTopLeft = avg(colorRedTopLeft, colorGreenTopLeft, colorBlueTopLeft);
@@ -643,7 +650,7 @@ private void aoFix() {
             at = @At(value = "HEAD"),
             require = 1)
     private void reuseXNeg(Block p_147798_1_, double p_147798_2_, double p_147798_4_, double p_147798_6_, IIcon p_147798_8_, CallbackInfo ci) {
-        aoFix();
+        aoFix(Facing.Direction.FACE_XNEG);
         reuse(Facing.Direction.FACE_XNEG);
     }
 
@@ -661,7 +668,7 @@ private double xNegBounds(RenderBlocks instance) {
             at = @At(value = "HEAD"),
             require = 1)
     private void reuseXPos(Block p_147798_1_, double p_147798_2_, double p_147798_4_, double p_147798_6_, IIcon p_147798_8_, CallbackInfo ci) {
-        aoFix();
+        aoFix(Facing.Direction.FACE_XPOS);
         reuse(Facing.Direction.FACE_XPOS);
     }
 
@@ -679,7 +686,7 @@ private double xPosBounds(RenderBlocks instance) {
             at = @At(value = "HEAD"),
             require = 1)
     private void reuseYNeg(Block p_147798_1_, double p_147798_2_, double p_147798_4_, double p_147798_6_, IIcon p_147798_8_, CallbackInfo ci) {
-        aoFix();
+        aoFix(Facing.Direction.FACE_YNEG);
         reuse(Facing.Direction.FACE_YNEG);
     }
 
@@ -698,7 +705,7 @@ private double yNegBounds(RenderBlocks instance) {
             at = @At(value = "HEAD"),
             require = 1)
     private void reuseYPos(Block p_147798_1_, double p_147798_2_, double p_147798_4_, double p_147798_6_, IIcon p_147798_8_, CallbackInfo ci) {
-        aoFix();
+        aoFix(Facing.Direction.FACE_YPOS);
         reuse(Facing.Direction.FACE_YPOS);
     }
 
@@ -717,7 +724,7 @@ private double yPosBounds(RenderBlocks instance) {
             at = @At(value = "HEAD"),
             require = 1)
     private void reuseZNeg(Block p_147798_1_, double p_147798_2_, double p_147798_4_, double p_147798_6_, IIcon p_147798_8_, CallbackInfo ci) {
-        aoFix();
+        aoFix(Facing.Direction.FACE_ZNEG);
         reuse(Facing.Direction.FACE_ZNEG);
     }
 
@@ -735,7 +742,7 @@ private double zNegBounds(RenderBlocks instance) {
             at = @At(value = "HEAD"),
             require = 1)
     private void reuseZPos(Block p_147798_1_, double p_147798_2_, double p_147798_4_, double p_147798_6_, IIcon p_147798_8_, CallbackInfo ci) {
-        aoFix();
+        aoFix(Facing.Direction.FACE_ZPOS);
         reuse(Facing.Direction.FACE_ZPOS);
     }
 

src/main/java/com/falsepattern/falsetweaks/mixin/mixins/client/triangulator/chromaticraft/RuneRendererMixin.java

@@ -79,11 +79,6 @@ public enum Mixin implements IMixin {
                                    TRIANGULATOR.and(REQUIRE_OPTIFINE_WITH_SHADERS),
                                    "triangulator.optifine.TessellatorOptiFineMixin"),
 
-    //ChromatiCraft
-    Tri_CCRuneRendererMixin(Side.CLIENT,
-                            TRIANGULATOR.and(require(TargetedMod.CHROMATICRAFT)),
-                            "triangulator.chromaticraft.RuneRendererMixin"),
-
     //RedstonePaste
     Tri_RedstonePasteHighlighterMixin(Side.CLIENT,
                                       TRIANGULATOR.and(require(TargetedMod.REDSTONEPASTE)),

src/main/java/com/falsepattern/falsetweaks/mixin/plugin/standard/Mixin.java

@@ -43,7 +43,6 @@ public enum TargetedMod implements ITargetedMod {
     OPTIFINE_WITH_SHADERS("OptiFine with shaders", false, contains("optifine").and(OPTIFINE_SHADERSMOD_VERSIONS)),
     OPTIFINE_WITH_DYNAMIC_LIGHTS("OptiFine with dynamic lights", false, contains("optifine").and(OPTIFINE_DYNAMIC_LIGHTS_VERSIONS)),
     FASTCRAFT("FastCraft", false, contains("fastcraft")),
-    CHROMATICRAFT("ChromatiCraft", false, contains("chromaticraft")),
     REDSTONEPASTE("RedstonePaste", false, contains("redstonepaste")),
     APPARATUS("Apparatus", false, contains("apparatus")),
     RAILCRAFT("Railcraft", true, contains("railcraft")),