Fix bottom-face being flipped for compact CTM (#1820)

dependencies.gradle

@@ -66,7 +66,7 @@ configurations.all {
 }
 
 dependencies {
-    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.7.14:dev")
+    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.7.158:dev")
 
     compileOnly("com.gtnewhorizons.retrofuturabootstrap:RetroFuturaBootstrap:1.1.0") { transitive = false }
 //    runtimeOnlyNonPublishable("com.github.GTNewHorizons:lwjgl3ify:3.0.99")

src/main/java/com/gtnewhorizons/angelica/loading/fml/transformers/CeleritasBlockTransformer.java

@@ -17,7 +17,6 @@ public class CeleritasBlockTransformer implements IClassTransformer {
     public CeleritasBlockTransformer() {
         this.inner = new CeleritasBlockTransform(AngelicaClientTweaker.isObfEnv());
         this.exclusions = inner.getTransformerExclusions();
-        this.inner.setCeleritasSetting();
     }
 
     /**

src/main/java/com/gtnewhorizons/angelica/loading/shared/transformers/CeleritasBlockTransform.java

@@ -31,16 +31,21 @@ public final class CeleritasBlockTransform implements Opcodes {
     private static final Logger LOGGER = LogManager.getLogger("CeleritasBlockTransformer");
     private static final String BlockClass = "net/minecraft/block/Block";
     private static final String ThreadedBlockData = "com/gtnewhorizons/angelica/client/rendering/ThreadedBlockData";
+    /** All classes under <tt>net.minecraft.block.Block*</tt> are Block subclasses save for these. */
+    private static final String[] VanillaBlockExclusions = {
+        "net/minecraft/block/IGrowable",
+        "net/minecraft/block/ITileEntityProvider",
+        "net/minecraft/block/BlockEventData",
+        "net/minecraft/block/BlockSourceImpl",
+        "net/minecraft/block/material/"
+    };
 
     private final Map<String, String> fieldNameToRedirect = new HashMap<>();
-    private final Set<String> blockSubclasses = Collections.newSetFromMap(new ConcurrentHashMap<>());
+    private final Set<String> moddedBlockSubclasses = Collections.newSetFromMap(new ConcurrentHashMap<>());
     // Block subclass owners we shouldn't redirect because they shadow some fields we want to redirect
     private final Set<String> blockSubclassExclusions = Collections.newSetFromMap(new ConcurrentHashMap<>());
     private final ClassConstantPoolParser cstPoolParser;
 
-    private final MethodHandle celeritasEnabledGetter;
-    private boolean isCeleritasEnabled;
-
     public CeleritasBlockTransform(boolean isObf) {
         final List<Pair<String, String>> mappings = ImmutableList.of(
             Pair.of("minX", "field_149759_B"),
@@ -56,37 +61,30 @@ public final class CeleritasBlockTransform implements Opcodes {
         }
 
         this.cstPoolParser = new ClassConstantPoolParser(this.fieldNameToRedirect.keySet().toArray(new String[0]));
+    }
 
-        blockSubclasses.add(BlockClass);
-
-        try {
-            // Needed because the config is loaded in LaunchClassLoader, but we need to access it in the parent system loader.
-            final Class<?> angelicaConfig = Class.forName("com.gtnewhorizons.angelica.config.AngelicaConfig", true, Launch.classLoader);
-            celeritasEnabledGetter = MethodHandles.lookup().findStaticGetter(angelicaConfig, "enableCeleritas", boolean.class);
-        } catch (ReflectiveOperationException e) {
-            throw new RuntimeException(e);
+    private boolean isVanillaBlockSubclass(String className) {
+        if (!className.startsWith(BlockClass)) {
+            return false;
         }
-    }
-
-    public void setCeleritasSetting() {
-        isCeleritasEnabled = true;
-    }
-
-    private boolean isCeleritasEnabled() {
-        if (isCeleritasEnabled) return true;
-        try {
-            return (boolean) celeritasEnabledGetter.invokeExact();
-        } catch (Throwable e) {
-            throw new RuntimeException(e);
+        for (String exclusion : VanillaBlockExclusions) {
+            if (className.startsWith(exclusion)) {
+                return false;
+            }
         }
+        return true;
     }
 
-    // This method needs to be called for every class, including the ones we don't want to transform
+    private boolean isBlockSubclass(String className) {
+        return isVanillaBlockSubclass(className) || moddedBlockSubclasses.contains(className);
+    }
+
+    // This method needs to be called for every class, including the ones we don't want to transform.
+    // Vanilla blocks are recognized by name; only modded subclasses need tracking, and FML's
+    // EventSubscriptionTransformer guarantees a modded class's superclass loads first.
     public void trackBlockSubclasses(String className, String superClassName) {
-        // It works because the deepest subclasses are always transformed first due to
-        // ForgeEventTransformer recursive superclass loading
-        if (blockSubclasses.contains(superClassName)) {
-            blockSubclasses.add(className);
+        if (!isVanillaBlockSubclass(className) && isBlockSubclass(superClassName)) {
+            moddedBlockSubclasses.add(className);
 
             if (blockSubclassExclusions.contains(superClassName)) {
                 LOGGER.info("Class {} extends a class with shadowed block bounds fields and will be skipped from redirecting", className);
@@ -110,9 +108,6 @@ public final class CeleritasBlockTransform implements Opcodes {
 
     /** @return Was the class changed? */
     public boolean transformClassNode(String transformedName, ClassNode cn) {
-        if (!isCeleritasEnabled()) {
-            return false;
-        }
         boolean changed = false;
         if (BlockClass.equals(cn.name)) {
             changed = cn.fields.removeIf(field -> fieldNameToRedirect.containsKey(field.name));
@@ -124,7 +119,8 @@ public final class CeleritasBlockTransform implements Opcodes {
     }
 
     private void trackBlockShadowingFields(ClassNode cn) {
-        if (blockSubclasses.contains(cn.name)) {
+        // Only modded subclasses can shadow; vanilla declares these fields solely in Block.
+        if (moddedBlockSubclasses.contains(cn.name)) {
             for (FieldNode field : cn.fields) {
                 if (fieldNameToRedirect.containsKey(field.name)) {
                     LOGGER.info("Class '{}' shadows one or more block bounds fields, these accesses won't be redirected!", cn.name);
@@ -141,7 +137,7 @@ public final class CeleritasBlockTransform implements Opcodes {
             for (AbstractInsnNode node = mn.instructions.getFirst(); node != null; node = node.getNext()) {
                 if ((node.getOpcode() == GETFIELD || node.getOpcode() == PUTFIELD) && node instanceof FieldInsnNode fNode) {
                     String newFieldName = fieldNameToRedirect.get(fNode.name);
-                    if (newFieldName != null && blockSubclasses.contains(fNode.owner) && !blockSubclassExclusions.contains(fNode.owner)) {
+                    if (newFieldName != null && isBlockSubclass(fNode.owner) && !blockSubclassExclusions.contains(fNode.owner)) {
                         if (LOG_SPAM) {
                             LOGGER.info("Redirecting Block.{} in {} to thread-safe wrapper", fNode.name, transformedName);
                         }

src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java

@@ -329,6 +329,15 @@ public enum Mixins implements IMixins {
         )
     ),
 
+    IRIS_SHADERS_CHISEL_BEACON(new MixinBuilder("Iris Chisel Beacon Beam")
+        .setPhase(Phase.LATE)
+        .setApplyIf(() -> AngelicaConfig.enableIris)
+        .addRequiredMod(TargetedMod.CHISEL)
+        .addClientMixins(
+            "chisel.MixinRenderCarvableBeacon"
+        )
+    ),
+
     ANGELICA_TEXTURE(new MixinBuilder()
         .setPhase(Phase.EARLY)
         .setApplyIf(() -> AngelicaConfig.enableIris || AngelicaConfig.enableCeleritas)

src/main/java/com/gtnewhorizons/angelica/mixins/TargetedMod.java

@@ -10,6 +10,7 @@ public enum TargetedMod implements ITargetMod {
     ARCHAICFIX("org.embeddedt.archaicfix.ArchaicCore", "archaicfix"),
     BACKHAND("xonin.backhand.coremod.BackhandLoadingPlugin", "backhand"),
     CAMPFIRE_BACKPORT(null, "campfirebackport"),
+    CHISEL(null, "chisel"),
     COFHCORE( "cofh.asm.LoadingPlugin", "CoFHCore"),
     DYNAMIC_SURROUNDINGS_MIST("org.blockartistry.mod.DynSurround.mixinplugin.DynamicSurroundingsEarlyMixins", "dsurround"),
     DYNAMIC_SURROUNDINGS_ORIGINAL("org.blockartistry.mod.DynSurround.asm.TransformLoader", "dsurround"),

src/main/java/com/gtnewhorizons/angelica/render/SelectionBoxRenderer.java

@@ -1,28 +1,45 @@
 package com.gtnewhorizons.angelica.render;
 
+import com.gtnewhorizon.gtnhlib.client.renderer.vao.IVertexArrayObject;
+import com.gtnewhorizon.gtnhlib.client.renderer.vao.VertexBufferType;
+import com.gtnewhorizon.gtnhlib.client.renderer.vertex.DefaultVertexFormat;
+import com.gtnewhorizons.angelica.config.AngelicaConfig;
 import com.gtnewhorizons.angelica.glsm.GLStateManager;
 import com.gtnewhorizons.angelica.glsm.states.Color4;
 import com.gtnewhorizons.angelica.client.rendering.GlUniformFloat2v;
+import net.irisshaders.iris.api.v0.IrisApi;
 import net.minecraft.util.AxisAlignedBB;
 import org.embeddedt.embeddium.impl.gl.shader.GlProgram;
 import org.embeddedt.embeddium.impl.gl.shader.GlShader;
 import org.embeddedt.embeddium.impl.gl.shader.ShaderConstants;
 import org.embeddedt.embeddium.impl.gl.shader.ShaderType;
 import org.embeddedt.embeddium.impl.gl.shader.uniform.GlUniformFloat;
-import org.embeddedt.embeddium.impl.gl.shader.uniform.GlUniformFloat3v;
 import org.embeddedt.embeddium.impl.gl.shader.uniform.GlUniformFloat4v;
 import org.embeddedt.embeddium.impl.gl.shader.uniform.GlUniformMatrix4f;
 import org.embeddedt.embeddium.impl.render.shader.ShaderLoader;
 import org.joml.Matrix4f;
+import org.lwjgl.BufferUtils;
 import org.lwjgl.opengl.GL11;
 
+import java.nio.ByteBuffer;
+
 public final class SelectionBoxRenderer {
 
     private static GlProgram<SelectionBoxUniforms> program;
-    private static int emptyVao;
+    private static IVertexArrayObject vao;
     private static final Matrix4f mvpMatrix = new Matrix4f();
     private static final float[] colorBuf = new float[4];
 
+    private static final int VERT_COUNT = 24;
+    private static final float[] UNIT_EDGES = {
+        0,0,0, 1,0,0,  1,0,0, 1,0,1,
+        1,0,1, 0,0,1,  0,0,1, 0,0,0,
+        0,1,0, 1,1,0,  1,1,0, 1,1,1,
+        1,1,1, 0,1,1,  0,1,1, 0,1,0,
+        0,0,0, 0,1,0,  1,0,0, 1,1,0,
+        1,0,1, 1,1,1,  0,0,1, 0,1,1
+    };
+
     private SelectionBoxRenderer() {}
 
     public static void init() {
@@ -40,8 +57,6 @@ public final class SelectionBoxRenderer {
 
         program = builder.link(ctx -> new SelectionBoxUniforms(
                 ctx.bindUniform("u_MVP", GlUniformMatrix4f::new),
-                ctx.bindUniform("u_Min", GlUniformFloat3v::new),
-                ctx.bindUniform("u_Max", GlUniformFloat3v::new),
                 ctx.bindUniform("u_Color", GlUniformFloat4v::new),
                 needsGS ? ctx.bindUniform("u_ViewportSize", GlUniformFloat2v::new) : null,
                 needsGS ? ctx.bindUniform("u_LineWidth", GlUniformFloat::new) : null));
@@ -50,20 +65,34 @@ public final class SelectionBoxRenderer {
         fs.destroy();
         if (gs != null) gs.destroy();
 
-        emptyVao = GLStateManager.glGenVertexArrays();
+        final ByteBuffer buf = BufferUtils.createByteBuffer(UNIT_EDGES.length * Float.BYTES);
+        buf.asFloatBuffer().put(UNIT_EDGES);
+        vao = VertexBufferType.IMMUTABLE.allocate(DefaultVertexFormat.POSITION, GL11.GL_LINES, buf, VERT_COUNT);
     }
 
     public static void draw(AxisAlignedBB aabb, int color) {
-        if (program == null) return;
+        if (program == null || vao == null) return;
 
+        final float minX = (float) aabb.minX, minY = (float) aabb.minY, minZ = (float) aabb.minZ;
+        final float extX = (float) (aabb.maxX - aabb.minX);
+        final float extY = (float) (aabb.maxY - aabb.minY);
+        final float extZ = (float) (aabb.maxZ - aabb.minZ);
+
+        if (AngelicaConfig.enableIris && IrisApi.getInstance().isShaderPackInUse()) {
+            drawThroughShader(minX, minY, minZ, extX, extY, extZ, color);
+        } else {
+            drawFast(minX, minY, minZ, extX, extY, extZ, color);
+        }
+    }
+
+    private static void drawFast(float minX, float minY, float minZ, float extX, float extY, float extZ, int color) {
         final SelectionBoxUniforms uniforms = program.getInterface();
 
         program.bind();
 
         GLStateManager.getProjectionMatrix().mul(GLStateManager.getModelViewMatrix(), mvpMatrix);
+        mvpMatrix.translate(minX, minY, minZ).scale(extX, extY, extZ);
         uniforms.mvp.set(mvpMatrix);
-        uniforms.min.set((float) aabb.minX, (float) aabb.minY, (float) aabb.minZ);
-        uniforms.max.set((float) aabb.maxX, (float) aabb.maxY, (float) aabb.maxZ);
 
         if (color != -1) {
             colorBuf[0] = ((color >> 16) & 0xFF) / 255.0f;
@@ -84,25 +113,42 @@ public final class SelectionBoxRenderer {
             uniforms.lineWidth.setFloat(GLStateManager.getLineState().getWidth());
         }
 
-        GLStateManager.glBindVertexArray(emptyVao);
-        GLStateManager.glDrawArrays(GL11.GL_LINES, 0, 24);
-        GLStateManager.glBindVertexArray(0);
+        vao.render();
 
         program.unbind();
     }
 
+    private static void drawThroughShader(float minX, float minY, float minZ, float extX, float extY, float extZ, int color) {
+        GLStateManager.glPushMatrix();
+        GLStateManager.glTranslatef(minX, minY, minZ);
+        GLStateManager.glScalef(extX, extY, extZ);
+
+        final Color4 prev = GLStateManager.getColor();
+        final boolean overrideColor = color != -1;
+        if (overrideColor) {
+            GLStateManager.glColor4f(((color >> 16) & 0xFF) / 255.0f, ((color >> 8) & 0xFF) / 255.0f, (color & 0xFF) / 255.0f, 1.0f);
+        }
+
+        vao.render();
+
+        if (overrideColor) {
+            GLStateManager.glColor4f(prev.getRed(), prev.getGreen(), prev.getBlue(), prev.getAlpha());
+        }
+        GLStateManager.glPopMatrix();
+    }
+
     public static void destroy() {
         if (program != null) {
             program.destroy();
             program = null;
         }
-        if (emptyVao != 0) {
-            GLStateManager.glDeleteVertexArrays(emptyVao);
-            emptyVao = 0;
+        if (vao != null) {
+            vao.delete();
+            vao = null;
         }
     }
 
-    private record SelectionBoxUniforms(GlUniformMatrix4f mvp, GlUniformFloat3v min, GlUniformFloat3v max, GlUniformFloat4v color, GlUniformFloat2v viewportSize, GlUniformFloat lineWidth) {
+    private record SelectionBoxUniforms(GlUniformMatrix4f mvp, GlUniformFloat4v color, GlUniformFloat2v viewportSize, GlUniformFloat lineWidth) {
 
     }
 }

src/main/java/com/prupe/mcpatcher/ctm/BlockOrientation.java

@@ -20,11 +20,7 @@ final class BlockOrientation extends RenderBlockState {
     // 1 2 3
     // c: coordinate (x,y,z) 0-2
     private static final int[][][] NEIGHBOR_OFFSET = new int[][][] {
-        (
-            fixedBottomFaceUV
-                ? makeNeighborOffset(EAST_FACE, SOUTH_FACE, WEST_FACE, NORTH_FACE) // BOTTOM_FACE fixedBottomFaceUV
-                : makeNeighborOffset(WEST_FACE, SOUTH_FACE, EAST_FACE, NORTH_FACE) // BOTTOM_FACE not fixed
-        ),
+        makeNeighborOffset(EAST_FACE, SOUTH_FACE, WEST_FACE, NORTH_FACE), // BOTTOM_FACE
         makeNeighborOffset(WEST_FACE, SOUTH_FACE, EAST_FACE, NORTH_FACE), // TOP_FACE
         makeNeighborOffset(EAST_FACE, BOTTOM_FACE, WEST_FACE, TOP_FACE), // NORTH_FACE
         makeNeighborOffset(WEST_FACE, BOTTOM_FACE, EAST_FACE, TOP_FACE), // SOUTH_FACE
@@ -48,6 +44,7 @@ final class BlockOrientation extends RenderBlockState {
     private int textureFace;
     private int textureFaceOrig;
     private int rotateUV;
+    private boolean flipBottom;
 
     @Override
     public void clear() {
@@ -60,6 +57,7 @@ final class BlockOrientation extends RenderBlockState {
         offsetsComputed = false;
         haveOffsets = false;
         dx = dy = dz = 0;
+        flipBottom = !fixedBottomFaceUV;
     }
 
     @Override
@@ -104,7 +102,7 @@ final class BlockOrientation extends RenderBlockState {
 
     @Override
     public int[] getOffset(int blockFace, int relativeDirection) {
-        return NEIGHBOR_OFFSET[blockFace][rotateUV(relativeDirection)];
+        return NEIGHBOR_OFFSET[flipBottom && blockFace == 0 ? 1 : blockFace][rotateUV(relativeDirection)];
     }
 
     @Override
@@ -147,6 +145,11 @@ final class BlockOrientation extends RenderBlockState {
         return haveOffsets;
     }
 
+
+    public void setFlipBottom(){
+        flipBottom = true;
+    }
+
     @Override
     public boolean shouldConnectByBlock(Block neighbor, int neighborX, int neighborY, int neighborZ) {
         return block == neighbor
@@ -172,6 +175,7 @@ final class BlockOrientation extends RenderBlockState {
         copy.textureFace = textureFace;
         copy.textureFaceOrig = textureFaceOrig;
         copy.rotateUV = rotateUV;
+        copy.flipBottom = flipBottom;
 
         copy.blockAccess = blockAccess;
         copy.block = block;
@@ -204,6 +208,7 @@ final class BlockOrientation extends RenderBlockState {
         rotateUV = 0;
         textureFace = blockFaceToTextureFace(blockFace);
         metadataBits = (1 << metadata) | (1 << altMetadata);
+        flipBottom = !fixedBottomFaceUV;
     }
 
     void setBlockMetadata(Block block, int metadata, int face) {

src/main/java/com/prupe/mcpatcher/ctm/CompactCtmQuadProcessor.java

@@ -53,6 +53,9 @@ public final class CompactCtmQuadProcessor {
     }
 
     public boolean processFace(RenderBlocks rb, RenderBlockState renderBlockState, IIcon origIcon) {
+        if(renderBlockState instanceof BlockOrientation blockOrientation){
+            blockOrientation.setFlipBottom();
+        }
         int neighborBits = override.getNeighborBits(renderBlockState, origIcon);
 
         int ctmIndex = TileOverride.neighborMap[neighborBits & 0xFF];

src/main/resources/assets/angelica/shaders/selection_box.vert.glsl

@@ -1,19 +1,9 @@
 #version 330 core
 
-uniform mat4 u_MVP;
-uniform vec3 u_Min;
-uniform vec3 u_Max;
+layout(location = 0) in vec3 a_Position;
 
-const vec3 edges[24] = vec3[24](
-    vec3(0,0,0), vec3(1,0,0),  vec3(1,0,0), vec3(1,0,1),
-    vec3(1,0,1), vec3(0,0,1),  vec3(0,0,1), vec3(0,0,0),
-    vec3(0,1,0), vec3(1,1,0),  vec3(1,1,0), vec3(1,1,1),
-    vec3(1,1,1), vec3(0,1,1),  vec3(0,1,1), vec3(0,1,0),
-    vec3(0,0,0), vec3(0,1,0),  vec3(1,0,0), vec3(1,1,0),
-    vec3(1,0,1), vec3(1,1,1),  vec3(0,0,1), vec3(0,1,1)
-);
+uniform mat4 u_MVP;
 
 void main() {
-    vec3 pos = mix(u_Min, u_Max, edges[gl_VertexID]);
-    gl_Position = u_MVP * vec4(pos, 1.0);
+    gl_Position = u_MVP * vec4(a_Position, 1.0);
 }

src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinTileEntityBeaconRenderer.java

@@ -2,11 +2,14 @@ package com.gtnewhorizons.angelica.mixins.early.shaders;
 
 import net.coderbot.iris.gbuffer_overrides.matching.SpecialCondition;
 import net.coderbot.iris.layer.GbufferPrograms;
+import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.tileentity.TileEntityBeaconRenderer;
 import net.minecraft.tileentity.TileEntityBeacon;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(TileEntityBeaconRenderer.class)
@@ -22,5 +25,30 @@ public class MixinTileEntityBeaconRenderer {
         GbufferPrograms.teardownSpecialRenderCondition();
     }
 
+    /**
+     * Whoever wrote this part of vanilla code sucks. Just change the alpha my guy.
+     */
+    @Redirect(
+        method = "Lnet/minecraft/client/renderer/tileentity/TileEntityBeaconRenderer;renderTileEntityAt(Lnet/minecraft/tileentity/TileEntityBeacon;DDDF)V",
+        at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/Tessellator;setColorRGBA(IIII)V", ordinal = 0))
+    private void angelica$innerBeamColor(Tessellator tessellator, int r, int g, int b, int a) {
+        angelica$beamColor(tessellator, r, g, b, 255);
+    }
+
+    @Redirect(
+        method = "Lnet/minecraft/client/renderer/tileentity/TileEntityBeaconRenderer;renderTileEntityAt(Lnet/minecraft/tileentity/TileEntityBeacon;DDDF)V",
+        at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/Tessellator;setColorRGBA(IIII)V", ordinal = 1))
+    private void angelica$outerBeamColor(Tessellator tessellator, int r, int g, int b, int a) {
+        angelica$beamColor(tessellator, r, g, b, a);
+    }
+
+    /**
+     * Make beam fullbright.
+     */
+    @Unique
+    private void angelica$beamColor(Tessellator tessellator, int r, int g, int b, int a) {
+        tessellator.setColorRGBA(r, g, b, a);
+        tessellator.setBrightness(0x00F000F0);
+    }
 
 }

src/mixin/java/com/gtnewhorizons/angelica/mixins/late/chisel/MixinRenderCarvableBeacon.java

@@ -0,0 +1,52 @@
+package com.gtnewhorizons.angelica.mixins.late.chisel;
+
+import net.coderbot.iris.gbuffer_overrides.matching.SpecialCondition;
+import net.coderbot.iris.layer.GbufferPrograms;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.world.World;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+/**
+ * Chisel ships its own beacon beam renderer, we yoink a lot of the code from
+ * {@link com.gtnewhorizons.angelica.mixins.early.shaders.MixinTileEntityBeaconRenderer} to apply the same fixes here.
+ */
+@Pseudo
+@Mixin(targets = { "team.chisel.client.render.tile.RenderCarvableBeacon" }, remap = false)
+public class MixinRenderCarvableBeacon {
+
+    @Inject(method = "renderBeam(FLnet/minecraft/world/World;DDDIF)V", at = @At("HEAD"))
+    private void angelica$beginBeaconBeam(float f1, World world, double x, double y, double z, int meta, float partialTicks, CallbackInfo ci) {
+        GbufferPrograms.setupSpecialRenderCondition(SpecialCondition.BEACON_BEAM);
+    }
+
+    @Inject(method = "renderBeam(FLnet/minecraft/world/World;DDDIF)V", at = @At("RETURN"))
+    private void angelica$endBeaconBeam(float f1, World world, double x, double y, double z, int meta, float partialTicks, CallbackInfo ci) {
+        GbufferPrograms.teardownSpecialRenderCondition();
+    }
+
+    @Redirect(
+        method = "renderBeam(FLnet/minecraft/world/World;DDDIF)V",
+        at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/Tessellator;setColorRGBA(IIII)V", ordinal = 0, remap = true))
+    private void angelica$innerBeamColor(Tessellator tessellator, int r, int g, int b, int a) {
+        angelica$beamColor(tessellator, r, g, b, 255);
+    }
+
+    @Redirect(
+        method = "renderBeam(FLnet/minecraft/world/World;DDDIF)V",
+        at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/Tessellator;setColorRGBA(IIII)V", ordinal = 1, remap = true))
+    private void angelica$outerBeamColor(Tessellator tessellator, int r, int g, int b, int a) {
+        angelica$beamColor(tessellator, r, g, b, a);
+    }
+
+    @Unique
+    private void angelica$beamColor(Tessellator tessellator, int r, int g, int b, int a) {
+        tessellator.setColorRGBA(r, g, b, a);
+        tessellator.setBrightness(0x00F000F0);
+    }
+}