Misc: Use BlendState.ALPHA across all components

Johni0702 · Johni0702 · commit ac86037be828 · 2025-06-11T11:19:23.000+02:00
diff --git a/api/Elementa.api b/api/Elementa.api
@@ -2,6 +2,7 @@ public final class gg/essential/elementa/ElementaVersion : java/lang/Enum {
 	public static final field Companion Lgg/essential/elementa/ElementaVersion$Companion;
 	public static final field V0 Lgg/essential/elementa/ElementaVersion;
 	public static final field V1 Lgg/essential/elementa/ElementaVersion;
+	public static final field V10 Lgg/essential/elementa/ElementaVersion;
 	public static final field V2 Lgg/essential/elementa/ElementaVersion;
 	public static final field V3 Lgg/essential/elementa/ElementaVersion;
 	public static final field V4 Lgg/essential/elementa/ElementaVersion;
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 kotlin = "1.5.10"
 kotlinx-coroutines = "1.5.2"
 jetbrains-annotations = "23.0.0"
-universalcraft = "389"
+universalcraft = "406"
 commonmark = "0.17.1"
 dom4j = "2.1.1"
 
diff --git a/src/main/kotlin/gg/essential/elementa/ElementaVersion.kt b/src/main/kotlin/gg/essential/elementa/ElementaVersion.kt
@@ -8,6 +8,7 @@ import gg.essential.elementa.constraints.SuperConstraint
 import gg.essential.elementa.constraints.animation.AnimationComponent
 import gg.essential.elementa.effects.Effect
 import gg.essential.universal.render.URenderPipeline
+import gg.essential.universal.shader.BlendState
 
 /**
  * Sometimes it is necessary or desirable to introduce breaking behavioral changes to Elementa. In order to maintain
@@ -180,8 +181,16 @@ enum class ElementaVersion {
      * All Minecraft versions now use [URenderPipeline] instead of modifying global GL state.
      * Additionally, [UIText] and [UIWrappedText] no longer enable (and forget to disable) blending.
      */
+    @Deprecated(DEPRECATION_MESSAGE)
     V9,
 
+    /**
+     * All components now use [BlendState.ALPHA] instead of [BlendState.NORMAL] and variants.
+     * This fixes the alpha channel of the render result, allowing it to be correctly composited with other textures.
+     * See [UniversalCraft#105](https://github.com/EssentialGG/UniversalCraft/pull/105) for more details.
+     */
+    V10,
+
     ;
 
     /**
@@ -230,10 +239,14 @@ Be sure to read through all the changes between your current version and your ne
         internal val v7 = V7
         @Suppress("DEPRECATION")
         internal val v8 = V8
+        @Suppress("DEPRECATION")
         internal val v9 = V9
+        internal val v10 = V10
 
         internal val atLeastV9Active: Boolean
             get() = active >= v9
+        internal val atLeastV10Active: Boolean
+            get() = active >= v10
 
         @PublishedApi
         internal var active: ElementaVersion = v0
diff --git a/src/main/kotlin/gg/essential/elementa/components/GradientComponent.kt b/src/main/kotlin/gg/essential/elementa/components/GradientComponent.kt
@@ -139,7 +139,7 @@ open class GradientComponent constructor(
             bufferBuilder.pos(matrixStack, x1, y1, 0.0).color(colors.topLeft).endVertex()
             bufferBuilder.pos(matrixStack, x1, y2, 0.0).color(colors.bottomLeft).endVertex()
             bufferBuilder.pos(matrixStack, x2, y2, 0.0).color(colors.bottomRight).endVertex()
-            bufferBuilder.build()?.drawAndClose(PIPELINE)
+            bufferBuilder.build()?.drawAndClose(if (ElementaVersion.atLeastV10Active) PIPELINE2 else PIPELINE)
         }
 
         @Deprecated("Stops working in 1.21.5")
@@ -169,7 +169,12 @@ open class GradientComponent constructor(
         }
 
         private val PIPELINE = URenderPipeline.builderWithDefaultShader("elementa:gradient_block", UGraphics.DrawMode.QUADS, UGraphics.CommonVertexFormats.POSITION_COLOR).apply {
+            @Suppress("DEPRECATION")
             blendState = BlendState.NORMAL.copy(srcAlpha = BlendState.Param.ONE, dstAlpha = BlendState.Param.ZERO)
         }.build()
+
+        private val PIPELINE2 = URenderPipeline.builderWithDefaultShader("elementa:gradient_block", UGraphics.DrawMode.QUADS, UGraphics.CommonVertexFormats.POSITION_COLOR).apply {
+            blendState = BlendState.ALPHA
+        }.build()
     }
 }
diff --git a/src/main/kotlin/gg/essential/elementa/components/UIBlock.kt b/src/main/kotlin/gg/essential/elementa/components/UIBlock.kt
@@ -64,7 +64,7 @@ open class UIBlock(colorConstraint: ColorConstraint = Color.WHITE.toConstraint()
 
             val bufferBuilder = UBufferBuilder.create(UGraphics.DrawMode.QUADS, UGraphics.CommonVertexFormats.POSITION_COLOR)
             drawBlock(bufferBuilder, matrixStack, color, x1, y1, x2, y2)
-            bufferBuilder.build()?.drawAndClose(PIPELINE)
+            bufferBuilder.build()?.drawAndClose(if (ElementaVersion.atLeastV10Active) PIPELINE2 else PIPELINE)
         }
 
         @Deprecated("Stops working in 1.21.5, see UGraphics.Globals")
@@ -133,6 +133,7 @@ open class UIBlock(colorConstraint: ColorConstraint = Color.WHITE.toConstraint()
         }
 
         private val PIPELINE = URenderPipeline.builderWithDefaultShader("elementa:block", UGraphics.DrawMode.QUADS, UGraphics.CommonVertexFormats.POSITION_COLOR).apply {
+            @Suppress("DEPRECATION")
             blendState = BlendState.NORMAL.copy(srcAlpha = BlendState.Param.ONE, dstAlpha = BlendState.Param.ZERO)
             // At some point MC started enabling its depth test during font rendering but all GUI code is
             // essentially flat and has depth tests disabled. This can cause stuff rendered in the background of the
@@ -141,5 +142,15 @@ open class UIBlock(colorConstraint: ColorConstraint = Color.WHITE.toConstraint()
             // To work around this, we'll write depth buffer unconditionally in the area where we draw the block.
             depthTest = URenderPipeline.DepthTest.Always
         }.build()
+
+        private val PIPELINE2 = URenderPipeline.builderWithDefaultShader("elementa:block", UGraphics.DrawMode.QUADS, UGraphics.CommonVertexFormats.POSITION_COLOR).apply {
+            blendState = BlendState.ALPHA
+            // At some point MC started enabling its depth test during font rendering but all GUI code is
+            // essentially flat and has depth tests disabled. This can cause stuff rendered in the background of the
+            // GUI to interfere with text rendered in the foreground because none of the blocks rendered in between
+            // will actually write to the depth buffer.
+            // To work around this, we'll write depth buffer unconditionally in the area where we draw the block.
+            depthTest = URenderPipeline.DepthTest.Always
+        }.build()
     }
 }
diff --git a/src/main/kotlin/gg/essential/elementa/components/UICircle.kt b/src/main/kotlin/gg/essential/elementa/components/UICircle.kt
@@ -78,10 +78,22 @@ class UICircle @JvmOverloads constructor(radius: Float = 0f, color: Color = Colo
             readElementaShaderSource("rect", "vsh"),
             readElementaShaderSource("circle", "fsh"),
         ).apply {
+            @Suppress("DEPRECATION")
             blendState = BlendState.NORMAL
             depthTest = URenderPipeline.DepthTest.Always // see UIBlock.PIPELINE
         }.build()
 
+        private val PIPELINE2 = URenderPipeline.builderWithLegacyShader(
+            "elementa:circle",
+            UGraphics.DrawMode.QUADS,
+            UGraphics.CommonVertexFormats.POSITION_COLOR,
+            readElementaShaderSource("rect", "vsh"),
+            readElementaShaderSource("circle", "fsh"),
+        ).apply {
+            blendState = BlendState.ALPHA
+            depthTest = URenderPipeline.DepthTest.Always // see UIBlock.PIPELINE
+        }.build()
+
         fun initShaders() {
             if (URenderPipeline.isRequired) return
             if (::shader.isInitialized)
@@ -120,7 +132,7 @@ class UICircle @JvmOverloads constructor(radius: Float = 0f, color: Color = Colo
                 (centerX + radius).toDouble(),
                 (centerY + radius).toDouble()
             )
-            bufferBuilder.build()?.drawAndClose(PIPELINE) {
+            bufferBuilder.build()?.drawAndClose(if (ElementaVersion.atLeastV10Active) PIPELINE2 else PIPELINE) {
                 uniform("u_Radius", radius)
                 uniform("u_CenterPos", centerX, centerY)
             }
diff --git a/src/main/kotlin/gg/essential/elementa/components/UIRoundedRectangle.kt b/src/main/kotlin/gg/essential/elementa/components/UIRoundedRectangle.kt
@@ -49,10 +49,22 @@ open class UIRoundedRectangle(radius: Float) : UIComponent() {
             readElementaShaderSource("rect", "vsh"),
             readElementaShaderSource("rounded_rect", "fsh"),
         ).apply {
+            @Suppress("DEPRECATION")
             blendState = BlendState.NORMAL
             depthTest = URenderPipeline.DepthTest.Always // see UIBlock.PIPELINE
         }.build()
 
+        private val PIPELINE2 = URenderPipeline.builderWithLegacyShader(
+            "elementa:rounded_rectangle",
+            UGraphics.DrawMode.QUADS,
+            UGraphics.CommonVertexFormats.POSITION_COLOR,
+            readElementaShaderSource("rect", "vsh"),
+            readElementaShaderSource("rounded_rect", "fsh"),
+        ).apply {
+            blendState = BlendState.ALPHA
+            depthTest = URenderPipeline.DepthTest.Always // see UIBlock.PIPELINE
+        }.build()
+
         fun initShaders() {
             if (URenderPipeline.isRequired) return
             if (::shader.isInitialized)
@@ -86,7 +98,7 @@ open class UIRoundedRectangle(radius: Float) : UIComponent() {
 
             val bufferBuilder = UBufferBuilder.create(UGraphics.DrawMode.QUADS, UGraphics.CommonVertexFormats.POSITION_COLOR)
             UIBlock.drawBlock(bufferBuilder, matrixStack, color, left.toDouble(), top.toDouble(), right.toDouble(), bottom.toDouble())
-            bufferBuilder.build()?.drawAndClose(PIPELINE) {
+            bufferBuilder.build()?.drawAndClose(if (ElementaVersion.atLeastV10Active) PIPELINE2 else PIPELINE) {
                 uniform("u_Radius", radius)
                 uniform("u_InnerRect", left + radius, top + radius, right - radius, bottom - radius)
             }
diff --git a/src/main/kotlin/gg/essential/elementa/components/UIShape.kt b/src/main/kotlin/gg/essential/elementa/components/UIShape.kt
@@ -63,7 +63,7 @@ open class UIShape @JvmOverloads constructor(color: Color = Color.WHITE) : UICom
                 .color(color.red, color.green, color.blue, color.alpha)
                 .endVertex()
         }
-        bufferBuilder.build()?.drawAndClose(PIPELINE)
+        bufferBuilder.build()?.drawAndClose(if (ElementaVersion.atLeastV10Active) PIPELINE2 else PIPELINE)
     }
 
     @Deprecated("Stops working in 1.21.5, see UGraphics.Globals")
@@ -98,7 +98,11 @@ open class UIShape @JvmOverloads constructor(color: Color = Color.WHITE) : UICom
 
     private companion object {
         private val PIPELINE = URenderPipeline.builderWithDefaultShader("elementa:shape", UGraphics.DrawMode.TRIANGLE_FAN, UGraphics.CommonVertexFormats.POSITION_COLOR).apply {
+            @Suppress("DEPRECATION")
             blendState = BlendState.NORMAL.copy(srcAlpha = BlendState.Param.ONE, dstAlpha = BlendState.Param.ZERO)
         }.build()
+        private val PIPELINE2 = URenderPipeline.builderWithDefaultShader("elementa:shape", UGraphics.DrawMode.TRIANGLE_FAN, UGraphics.CommonVertexFormats.POSITION_COLOR).apply {
+            blendState = BlendState.ALPHA
+        }.build()
     }
 }
diff --git a/src/main/kotlin/gg/essential/elementa/components/inspector/Inspector.kt b/src/main/kotlin/gg/essential/elementa/components/inspector/Inspector.kt
@@ -382,7 +382,7 @@ class Inspector @JvmOverloads constructor(
             UGraphics.DrawMode.QUADS,
             UGraphics.CommonVertexFormats.POSITION_COLOR,
         ).apply {
-            blendState = BlendState.NORMAL
+            blendState = BlendState.ALPHA
             depthTest = URenderPipeline.DepthTest.Less
         }.build()
     }
diff --git a/src/main/kotlin/gg/essential/elementa/font/BasicFontRenderer.kt b/src/main/kotlin/gg/essential/elementa/font/BasicFontRenderer.kt
@@ -152,7 +152,7 @@ class BasicFontRenderer(
         if (URenderPipeline.isRequired || ElementaVersion.atLeastV9Active) {
             val bufferBuilder = UBufferBuilder.create(UGraphics.DrawMode.QUADS, UGraphics.CommonVertexFormats.POSITION_TEXTURE_COLOR)
             drawStringNow(bufferBuilder, matrixStack, string, color, x, y, originalPointSize)
-            bufferBuilder.build()?.drawAndClose(PIPELINE) {
+            bufferBuilder.build()?.drawAndClose(if (ElementaVersion.atLeastV10Active) PIPELINE2 else PIPELINE) {
                 texture(0, regularFont.getTexture().dynamicGlId)
             }
         } else {
@@ -275,7 +275,11 @@ class BasicFontRenderer(
 
     private companion object {
         private val PIPELINE = URenderPipeline.builderWithDefaultShader("elementa:basic_font", UGraphics.DrawMode.QUADS, UGraphics.CommonVertexFormats.POSITION_COLOR).apply {
+            @Suppress("DEPRECATION")
             blendState = BlendState.NORMAL.copy(srcAlpha = BlendState.Param.ONE, dstAlpha = BlendState.Param.ZERO)
         }.build()
+        private val PIPELINE2 = URenderPipeline.builderWithDefaultShader("elementa:basic_font", UGraphics.DrawMode.QUADS, UGraphics.CommonVertexFormats.POSITION_COLOR).apply {
+            blendState = BlendState.ALPHA
+        }.build()
     }
 }
diff --git a/src/main/kotlin/gg/essential/elementa/utils/LineUtils.kt b/src/main/kotlin/gg/essential/elementa/utils/LineUtils.kt
@@ -13,8 +13,12 @@ import kotlin.math.sqrt
 
 object LineUtils {
     private val PIPELINE = URenderPipeline.builderWithDefaultShader("elementa:line_strip", UGraphics.DrawMode.TRIANGLE_STRIP, UGraphics.CommonVertexFormats.POSITION_COLOR).apply {
+        @Suppress("DEPRECATION")
         blendState = BlendState.NORMAL
     }.build()
+    private val PIPELINE2 = URenderPipeline.builderWithDefaultShader("elementa:line_strip", UGraphics.DrawMode.TRIANGLE_STRIP, UGraphics.CommonVertexFormats.POSITION_COLOR).apply {
+        blendState = BlendState.ALPHA
+    }.build()
 
     @Deprecated(UMatrixStack.Compat.DEPRECATED, ReplaceWith("drawLine(UMatrixStack(), x1, y1, x2, y2, color, width)"))
     @JvmStatic
@@ -31,7 +35,7 @@ object LineUtils {
         if (URenderPipeline.isRequired || ElementaVersion.atLeastV9Active) {
             val bufferBuilder = UBufferBuilder.create(UGraphics.DrawMode.TRIANGLE_STRIP, UGraphics.CommonVertexFormats.POSITION_COLOR)
             drawLineStrip(bufferBuilder, matrixStack, points, color, width)
-            bufferBuilder.build()?.drawAndClose(PIPELINE)
+            bufferBuilder.build()?.drawAndClose(if (ElementaVersion.atLeastV10Active) PIPELINE2 else PIPELINE)
         } else {
             @Suppress("DEPRECATION")
             UGraphics.enableBlend()
diff --git a/src/main/kotlin/gg/essential/elementa/utils/image.kt b/src/main/kotlin/gg/essential/elementa/utils/image.kt
@@ -50,7 +50,7 @@ internal fun drawTexture(
     if (URenderPipeline.isRequired || ElementaVersion.atLeastV9Active) {
         val bufferBuilder = UBufferBuilder.create(UGraphics.DrawMode.QUADS, UGraphics.CommonVertexFormats.POSITION_TEXTURE_COLOR)
         drawTexturedQuad(bufferBuilder)
-        bufferBuilder.build()?.drawAndClose(TEXTURED_QUAD_PIPELINE) {
+        bufferBuilder.build()?.drawAndClose(if (ElementaVersion.atLeastV10Active) TEXTURED_QUAD_PIPELINE2 else TEXTURED_QUAD_PIPELINE) {
             texture(0, glId)
         }
     } else {
@@ -73,9 +73,18 @@ private val TEXTURED_QUAD_PIPELINE = URenderPipeline.builderWithDefaultShader(
     UGraphics.DrawMode.QUADS,
     UGraphics.CommonVertexFormats.POSITION_TEXTURE_COLOR,
 ).apply {
+    @Suppress("DEPRECATION")
     blendState = BlendState.NORMAL
 }.build()
 
+private val TEXTURED_QUAD_PIPELINE2 = URenderPipeline.builderWithDefaultShader(
+    "elementa:textured_quad",
+    UGraphics.DrawMode.QUADS,
+    UGraphics.CommonVertexFormats.POSITION_TEXTURE_COLOR,
+).apply {
+    blendState = BlendState.ALPHA
+}.build()
+
 fun decodeBlurHash(blurHash: String?, width: Int, height: Int, punch: Float = 1f): BufferedImage? {
     if (blurHash == null || blurHash.length < 6) return null
 

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ open class GradientComponent constructor(`
`139`	`139`	`bufferBuilder.pos(matrixStack, x1, y1, 0.0).color(colors.topLeft).endVertex()`
`140`	`140`	`bufferBuilder.pos(matrixStack, x1, y2, 0.0).color(colors.bottomLeft).endVertex()`
`141`	`141`	`bufferBuilder.pos(matrixStack, x2, y2, 0.0).color(colors.bottomRight).endVertex()`
`142`		`- bufferBuilder.build()?.drawAndClose(PIPELINE)`
	`142`	`+ bufferBuilder.build()?.drawAndClose(if (ElementaVersion.atLeastV10Active) PIPELINE2 else PIPELINE)`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`@Deprecated("Stops working in 1.21.5")`
`@@ -169,7 +169,12 @@ open class GradientComponent constructor(`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`private val PIPELINE = URenderPipeline.builderWithDefaultShader("elementa:gradient_block", UGraphics.DrawMode.QUADS, UGraphics.CommonVertexFormats.POSITION_COLOR).apply {`
	`172`	`+ @Suppress("DEPRECATION")`
`172`	`173`	`blendState = BlendState.NORMAL.copy(srcAlpha = BlendState.Param.ONE, dstAlpha = BlendState.Param.ZERO)`
`173`	`174`	`}.build()`
	`175`	`+`
	`176`	`+ private val PIPELINE2 = URenderPipeline.builderWithDefaultShader("elementa:gradient_block", UGraphics.DrawMode.QUADS, UGraphics.CommonVertexFormats.POSITION_COLOR).apply {`
	`177`	`+ blendState = BlendState.ALPHA`
	`178`	`+ }.build()`
`174`	`179`	`}`
`175`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ open class UIShape @JvmOverloads constructor(color: Color = Color.WHITE) : UICom`
`63`	`63`	`.color(color.red, color.green, color.blue, color.alpha)`
`64`	`64`	`.endVertex()`
`65`	`65`	`}`
`66`		`- bufferBuilder.build()?.drawAndClose(PIPELINE)`
	`66`	`+ bufferBuilder.build()?.drawAndClose(if (ElementaVersion.atLeastV10Active) PIPELINE2 else PIPELINE)`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`@Deprecated("Stops working in 1.21.5, see UGraphics.Globals")`
`@@ -98,7 +98,11 @@ open class UIShape @JvmOverloads constructor(color: Color = Color.WHITE) : UICom`
`98`	`98`
`99`	`99`	`private companion object {`
`100`	`100`	`private val PIPELINE = URenderPipeline.builderWithDefaultShader("elementa:shape", UGraphics.DrawMode.TRIANGLE_FAN, UGraphics.CommonVertexFormats.POSITION_COLOR).apply {`
	`101`	`+ @Suppress("DEPRECATION")`
`101`	`102`	`blendState = BlendState.NORMAL.copy(srcAlpha = BlendState.Param.ONE, dstAlpha = BlendState.Param.ZERO)`
`102`	`103`	`}.build()`
	`104`	`+ private val PIPELINE2 = URenderPipeline.builderWithDefaultShader("elementa:shape", UGraphics.DrawMode.TRIANGLE_FAN, UGraphics.CommonVertexFormats.POSITION_COLOR).apply {`
	`105`	`+ blendState = BlendState.ALPHA`
	`106`	`+ }.build()`
`103`	`107`	`}`
`104`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,7 @@ class Inspector @JvmOverloads constructor(`
`382`	`382`	`UGraphics.DrawMode.QUADS,`
`383`	`383`	`UGraphics.CommonVertexFormats.POSITION_COLOR,`
`384`	`384`	`).apply {`
`385`		`- blendState = BlendState.NORMAL`
	`385`	`+ blendState = BlendState.ALPHA`
`386`	`386`	`depthTest = URenderPipeline.DepthTest.Less`
`387`	`387`	`}.build()`
`388`	`388`	`}`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ class BasicFontRenderer(`
`152`	`152`	`if (URenderPipeline.isRequired \|\| ElementaVersion.atLeastV9Active) {`
`153`	`153`	`val bufferBuilder = UBufferBuilder.create(UGraphics.DrawMode.QUADS, UGraphics.CommonVertexFormats.POSITION_TEXTURE_COLOR)`
`154`	`154`	`drawStringNow(bufferBuilder, matrixStack, string, color, x, y, originalPointSize)`
`155`		`- bufferBuilder.build()?.drawAndClose(PIPELINE) {`
	`155`	`+ bufferBuilder.build()?.drawAndClose(if (ElementaVersion.atLeastV10Active) PIPELINE2 else PIPELINE) {`
`156`	`156`	`texture(0, regularFont.getTexture().dynamicGlId)`
`157`	`157`	`}`
`158`	`158`	`} else {`
`@@ -275,7 +275,11 @@ class BasicFontRenderer(`
`275`	`275`
`276`	`276`	`private companion object {`
`277`	`277`	`private val PIPELINE = URenderPipeline.builderWithDefaultShader("elementa:basic_font", UGraphics.DrawMode.QUADS, UGraphics.CommonVertexFormats.POSITION_COLOR).apply {`
	`278`	`+ @Suppress("DEPRECATION")`
`278`	`279`	`blendState = BlendState.NORMAL.copy(srcAlpha = BlendState.Param.ONE, dstAlpha = BlendState.Param.ZERO)`
`279`	`280`	`}.build()`
	`281`	`+ private val PIPELINE2 = URenderPipeline.builderWithDefaultShader("elementa:basic_font", UGraphics.DrawMode.QUADS, UGraphics.CommonVertexFormats.POSITION_COLOR).apply {`
	`282`	`+ blendState = BlendState.ALPHA`
	`283`	`+ }.build()`
`280`	`284`	`}`
`281`	`285`	`}`