fix: Revert to the manual background hack.

Vanilla's implementation is evidently, still ill-suited.

Author: Ampflower

src/main/java/dev/hephaestus/glowcase/client/render/block/entity/TextBlockEntityRenderer.java

@@ -3,28 +3,22 @@
 import dev.hephaestus.glowcase.Glowcase;
 import dev.hephaestus.glowcase.block.entity.TextBlockEntity;
 import dev.hephaestus.glowcase.client.util.BlockEntityRenderUtil;
+import dev.hephaestus.glowcase.mixin.client.TextRendererAccessor;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.BakedGlyph;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.font.TextRenderer.TextLayerType;
 import net.minecraft.client.render.LightmapTextureManager;
-import net.minecraft.client.render.VertexConsumer;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.block.entity.BlockEntityRendererFactory;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.Entity;
 import net.minecraft.state.property.Properties;
-import net.minecraft.text.PlainTextContent;
+import net.minecraft.text.Style;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.RotationAxis;
 import net.minecraft.util.math.Vec3d;
-import org.jetbrains.annotations.NotNull;
-import org.joml.Matrix4f;
-import org.joml.Quaternionf;
-
-import java.util.concurrent.atomic.AtomicBoolean;
 
 public class TextBlockEntityRenderer extends BakedBlockEntityRenderer<TextBlockEntity> {
 	public static Identifier ITEM_TEXTURE = Glowcase.id("textures/item/text_block.png");
@@ -125,18 +119,37 @@ public void renderBaked(TextBlockEntity entity, MatrixStack matrices, VertexCons
 			double dX = switch (entity.textAlignment) {
 				case LEFT -> -maxLength / 2D;
 				case CENTER -> (maxLength - width) / 2D - maxLength / 2D;
-				case CENTER_LEFT -> - (50D / entity.scale) - (width / 2D);
+				case CENTER_LEFT -> -(50D / entity.scale) - (width / 2D);
 				case CENTER_RIGHT -> (50D / entity.scale) - (width / 2D);
 				case RIGHT -> maxLength - width - maxLength / 2D;
 			};
 
 			matrices.push();
 			matrices.translate(dX, 0, 0);
 
-			TextRenderer.Drawer drawer = (TextRenderer.Drawer) textRenderer.prepare(line.asOrderedText(), 0, i * 12, entity.color, entity.shadow, entity.backgroundColor);
+			TextRenderer.Drawer drawer = (TextRenderer.Drawer) textRenderer.prepare(line.asOrderedText(), 0, i * 12, entity.color, entity.shadow, 0);
+
+			TextRenderer.GlyphDrawer glyphDrawer = TextRenderer.GlyphDrawer.drawing(
+				vertexConsumers,
+				matrices.peek().getPositionMatrix(),
+				TextLayerType.NORMAL,
+				// TODO: use the light param and add a toggle to make it glow (use LightmapTextureManager.MAX_LIGHT_COORDINATE)
+				LightmapTextureManager.MAX_LIGHT_COORDINATE
+			);
 
-			// TODO: use the light param and add a toggle to make it glow (use LightmapTextureManager.MAX_LIGHT_COORDINATE)
-			TextRenderer.GlyphDrawer glyphDrawer = getGlyphDrawer(matrices, vertexConsumers, LightmapTextureManager.MAX_LIGHT_COORDINATE);
+			// Yep, we're back to that hack again.
+			if (entity.backgroundColor != 0) {
+				BakedGlyph rectangleBakedGlyph = ((TextRendererAccessor) textRenderer)
+					.invokeGetFontStorage(Style.DEFAULT_FONT_ID)
+					.getRectangleBakedGlyph();
+
+				final BakedGlyph.Rectangle rect = new BakedGlyph.Rectangle(
+					-4, i * 12 - 2f,
+					(float) width + 4, (i + 1) * 12 - 2f,
+					-0.01F, entity.backgroundColor);
+
+				glyphDrawer.drawRectangle(rectangleBakedGlyph, rect);
+			}
 
 			drawer.draw(glyphDrawer);
 
@@ -146,39 +159,4 @@ public void renderBaked(TextBlockEntity entity, MatrixStack matrices, VertexCons
 		matrices.pop();
 	}
 
-	private static TextRenderer.@NotNull GlyphDrawer getGlyphDrawer(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light) {
-		return new TextRenderer.GlyphDrawer() {
-			public void drawGlyph(BakedGlyph.DrawnGlyph glyph) {
-				BakedGlyph bakedGlyph = glyph.glyph();
-				VertexConsumer vertexConsumer = vertexConsumers.getBuffer(bakedGlyph.getLayer(TextLayerType.NORMAL));
-				bakedGlyph.draw(glyph, matrices.peek().getPositionMatrix(), vertexConsumer, light, false);
-			}
-
-			public void drawRectangle(BakedGlyph bakedGlyph, BakedGlyph.Rectangle rect) {
-				rect = new BakedGlyph.Rectangle(rect.minX() - 4, rect.minY() - 2, rect.maxX() + 4, rect.maxY() + 2, rect.zIndex(), rect.color(), rect.shadowColor(), rect.shadowOffset());
-				VertexConsumer vertexConsumer = vertexConsumers.getBuffer(bakedGlyph.getLayer(TextLayerType.NORMAL));
-				bakedGlyph.drawRectangle(rect, matrices.peek().getPositionMatrix(), vertexConsumer, light, false);
-			}
-		};
-	}
-
-	@SuppressWarnings("SameParameterValue")
-	private void drawFillRect(MatrixStack matrices, VertexConsumerProvider vcp, int x1, int y1, int x2, int y2, int color) {
-		float red = (float) (color >> 16 & 255) / 255.0F;
-		float green = (float) (color >> 8 & 255) / 255.0F;
-		float blue = (float) (color & 255) / 255.0F;
-		float alpha = (float) (color >> 24 & 255) / 255.0F;
-
-		// Horrible up to no good hack to get proper translucency sorting :3
-		/*final GlyphRenderer renderer = ((TextRendererAccessor) MinecraftClient.getInstance().textRenderer)
-			.invokeGetFontStorage(Style.DEFAULT_FONT_ID).getRectangleRenderer();
-
-		final RenderLayer renderLayer = renderer.getLayer(TextLayerType.NORMAL);
-		final VertexConsumer consumer = vcp.getBuffer(renderLayer);
-		final Matrix4f matrix = matrices.peek().getPositionMatrix();
-
-		renderer.drawRectangle(new GlyphRenderer.Rectangle(
-			x1, y1, x2, y2, 0.2f, red, green, blue, alpha
-		), matrix, consumer, LightmapTextureManager.MAX_LIGHT_COORDINATE);*/
-	}
 }