Misc: Use URenderPipeline on all Minecraft versions

Johni0702 · Johni0702 · commit b6711cd533c8 · 2025-06-11T11:19:23.000+02:00
diff --git a/api/Elementa.api b/api/Elementa.api
@@ -9,6 +9,7 @@ public final class gg/essential/elementa/ElementaVersion : java/lang/Enum {
 	public static final field V6 Lgg/essential/elementa/ElementaVersion;
 	public static final field V7 Lgg/essential/elementa/ElementaVersion;
 	public static final field V8 Lgg/essential/elementa/ElementaVersion;
+	public static final field V9 Lgg/essential/elementa/ElementaVersion;
 	public final fun enableFor (Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
 	public static fun valueOf (Ljava/lang/String;)Lgg/essential/elementa/ElementaVersion;
 	public static fun values ()[Lgg/essential/elementa/ElementaVersion;
diff --git a/src/main/kotlin/gg/essential/elementa/ElementaVersion.kt b/src/main/kotlin/gg/essential/elementa/ElementaVersion.kt
@@ -1,10 +1,13 @@
 package gg.essential.elementa
 
+import gg.essential.elementa.components.UIText
+import gg.essential.elementa.components.UIWrappedText
 import gg.essential.elementa.components.UpdateFunc
 import gg.essential.elementa.components.Window
 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
 
 /**
  * Sometimes it is necessary or desirable to introduce breaking behavioral changes to Elementa. In order to maintain
@@ -170,8 +173,15 @@ enum class ElementaVersion {
      *   The new constraint tracking will only invalidate constraints which were evaluated, and the [UpdateFunc]s
      *   are tracked intelligently at registration, such that no more full tree traversals should be necessary.
      */
+    @Deprecated(DEPRECATION_MESSAGE)
     V8,
 
+    /**
+     * All Minecraft versions now use [URenderPipeline] instead of modifying global GL state.
+     * Additionally, [UIText] and [UIWrappedText] no longer enable (and forget to disable) blending.
+     */
+    V9,
+
     ;
 
     /**
@@ -218,8 +228,12 @@ Be sure to read through all the changes between your current version and your ne
         internal val v6 = V6
         @Suppress("DEPRECATION")
         internal val v7 = V7
+        @Suppress("DEPRECATION")
         internal val v8 = V8
+        internal val v9 = V9
 
+        internal val atLeastV9Active: Boolean
+            get() = active >= v9
 
         @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
@@ -1,5 +1,6 @@
 package gg.essential.elementa.components
 
+import gg.essential.elementa.ElementaVersion
 import gg.essential.elementa.state.BasicState
 import gg.essential.elementa.state.MappedState
 import gg.essential.elementa.state.State
@@ -127,7 +128,7 @@ open class GradientComponent constructor(
             endColor: Color,
             direction: GradientDirection
         ) {
-            if (!URenderPipeline.isRequired) {
+            if (!URenderPipeline.isRequired && !ElementaVersion.atLeastV9Active) {
                 @Suppress("DEPRECATION")
                 return drawGradientBlockLegacy(matrixStack, x1, y1, x2, y2, startColor, endColor, direction)
             }
diff --git a/src/main/kotlin/gg/essential/elementa/components/UIBlock.kt b/src/main/kotlin/gg/essential/elementa/components/UIBlock.kt
@@ -57,7 +57,7 @@ open class UIBlock(colorConstraint: ColorConstraint = Color.WHITE.toConstraint()
             drawBlock(UMatrixStack(), color, x1, y1, x2, y2)
 
         fun drawBlock(matrixStack: UMatrixStack, color: Color, x1: Double, y1: Double, x2: Double, y2: Double) {
-            if (!URenderPipeline.isRequired) {
+            if (!URenderPipeline.isRequired && !ElementaVersion.atLeastV9Active) {
                 @Suppress("DEPRECATION")
                 return drawBlockLegacy(matrixStack, color, x1, y1, x2, y2)
             }
diff --git a/src/main/kotlin/gg/essential/elementa/components/UICircle.kt b/src/main/kotlin/gg/essential/elementa/components/UICircle.kt
@@ -1,5 +1,6 @@
 package gg.essential.elementa.components
 
+import gg.essential.elementa.ElementaVersion
 import gg.essential.elementa.UIComponent
 import gg.essential.elementa.dsl.toConstraint
 import gg.essential.elementa.dsl.pixels
@@ -104,7 +105,7 @@ class UICircle @JvmOverloads constructor(radius: Float = 0f, color: Color = Colo
             drawCircle(UMatrixStack(), centerX, centerY, radius, color)
 
         fun drawCircle(matrixStack: UMatrixStack, centerX: Float, centerY: Float, radius: Float, color: Color) {
-            if (!URenderPipeline.isRequired) {
+            if (!URenderPipeline.isRequired && !ElementaVersion.atLeastV9Active) {
                 @Suppress("DEPRECATION")
                 return drawCircleLegacy(matrixStack, centerX, centerY, radius, color)
             }
diff --git a/src/main/kotlin/gg/essential/elementa/components/UIRoundedRectangle.kt b/src/main/kotlin/gg/essential/elementa/components/UIRoundedRectangle.kt
@@ -1,5 +1,6 @@
 package gg.essential.elementa.components
 
+import gg.essential.elementa.ElementaVersion
 import gg.essential.elementa.UIComponent
 import gg.essential.elementa.dsl.pixels
 import gg.essential.elementa.utils.readElementaShaderSource
@@ -78,7 +79,7 @@ open class UIRoundedRectangle(radius: Float) : UIComponent() {
          * Draws a rounded rectangle
          */
         fun drawRoundedRectangle(matrixStack: UMatrixStack, left: Float, top: Float, right: Float, bottom: Float, radius: Float, color: Color) {
-            if (!URenderPipeline.isRequired) {
+            if (!URenderPipeline.isRequired && !ElementaVersion.atLeastV9Active) {
                 @Suppress("DEPRECATION")
                 return drawRoundedRectangleLegacy(matrixStack, left, top, right, bottom, radius, color)
             }
diff --git a/src/main/kotlin/gg/essential/elementa/components/UIShape.kt b/src/main/kotlin/gg/essential/elementa/components/UIShape.kt
@@ -1,5 +1,6 @@
 package gg.essential.elementa.components
 
+import gg.essential.elementa.ElementaVersion
 import gg.essential.elementa.UIComponent
 import gg.essential.elementa.dsl.toConstraint
 import gg.essential.universal.UGraphics
@@ -44,7 +45,7 @@ open class UIShape @JvmOverloads constructor(color: Color = Color.WHITE) : UICom
         val color = this.getColor()
         if (color.alpha == 0) return super.draw(matrixStack)
 
-        if (URenderPipeline.isRequired) {
+        if (URenderPipeline.isRequired || ElementaVersion.atLeastV9Active) {
             draw(matrixStack, color)
         } else {
             @Suppress("DEPRECATION")
diff --git a/src/main/kotlin/gg/essential/elementa/components/UIText.kt b/src/main/kotlin/gg/essential/elementa/components/UIText.kt
@@ -1,5 +1,6 @@
 package gg.essential.elementa.components
 
+import gg.essential.elementa.ElementaVersion
 import gg.essential.elementa.UIComponent
 import gg.essential.elementa.UIConstraints
 import gg.essential.elementa.constraints.CenterConstraint
@@ -118,7 +119,7 @@ constructor(
             return super.draw(matrixStack)
         }
 
-        if (!URenderPipeline.isRequired) {
+        if (!URenderPipeline.isRequired && !ElementaVersion.atLeastV9Active) {
             @Suppress("DEPRECATION")
             UGraphics.enableBlend()
         }
diff --git a/src/main/kotlin/gg/essential/elementa/components/UIWrappedText.kt b/src/main/kotlin/gg/essential/elementa/components/UIWrappedText.kt
@@ -1,5 +1,6 @@
 package gg.essential.elementa.components
 
+import gg.essential.elementa.ElementaVersion
 import gg.essential.elementa.UIComponent
 import gg.essential.elementa.UIConstraints
 import gg.essential.elementa.constraints.CenterConstraint
@@ -152,7 +153,7 @@ open class UIWrappedText @JvmOverloads constructor(
             return super.draw(matrixStack)
         }
 
-        if (!URenderPipeline.isRequired) {
+        if (!URenderPipeline.isRequired && !ElementaVersion.atLeastV9Active) {
             @Suppress("DEPRECATION")
             UGraphics.enableBlend()
         }
diff --git a/src/main/kotlin/gg/essential/elementa/font/BasicFontRenderer.kt b/src/main/kotlin/gg/essential/elementa/font/BasicFontRenderer.kt
@@ -1,5 +1,6 @@
 package gg.essential.elementa.font
 
+import gg.essential.elementa.ElementaVersion
 import gg.essential.elementa.UIComponent
 import gg.essential.elementa.constraints.ConstraintType
 import gg.essential.elementa.constraints.resolution.ConstraintVisitor
@@ -148,7 +149,7 @@ class BasicFontRenderer(
         y: Float,
         originalPointSize: Float
     ) {
-        if (URenderPipeline.isRequired) {
+        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) {
diff --git a/src/main/kotlin/gg/essential/elementa/font/FontRenderer.kt b/src/main/kotlin/gg/essential/elementa/font/FontRenderer.kt
@@ -1,5 +1,6 @@
 package gg.essential.elementa.font
 
+import gg.essential.elementa.ElementaVersion
 import gg.essential.elementa.UIComponent
 import gg.essential.elementa.constraints.ConstraintType
 import gg.essential.elementa.constraints.resolution.ConstraintVisitor
@@ -25,7 +26,7 @@ import kotlin.math.max
 /**
  * [MSDF](https://github.com/Chlumsky/msdfgen) Font Renderer
  */
-@Deprecated("Not well maintained. Does not currently support 1.21.5+ at all.")
+@Deprecated("Not well maintained. Does not currently support 1.21.5+ or ElementaVersion.V9 at all.")
 @Suppress("DEPRECATION")
 class FontRenderer(
     private val regularFont: Font,
@@ -133,6 +134,9 @@ class FontRenderer(
         shadow: Boolean,
         shadowColor: Color?
     ) {
+        if (ElementaVersion.atLeastV9Active) {
+            return
+        }
         val effectiveSize = originalPointSize * scale * 1.3623059867f
         val adjustedY = y - effectiveSize / 5
         if (shadow) {
diff --git a/src/main/kotlin/gg/essential/elementa/utils/LineUtils.kt b/src/main/kotlin/gg/essential/elementa/utils/LineUtils.kt
@@ -1,5 +1,6 @@
 package gg.essential.elementa.utils
 
+import gg.essential.elementa.ElementaVersion
 import gg.essential.elementa.components.UIPoint
 import gg.essential.universal.UGraphics
 import gg.essential.universal.UMatrixStack
@@ -27,7 +28,7 @@ object LineUtils {
 
     @JvmStatic
     fun drawLineStrip(matrixStack: UMatrixStack, points: List<Pair<Number, Number>>, color: Color, width: Float) {
-        if (URenderPipeline.isRequired) {
+        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)
diff --git a/src/main/kotlin/gg/essential/elementa/utils/image.kt b/src/main/kotlin/gg/essential/elementa/utils/image.kt
@@ -1,5 +1,6 @@
 package gg.essential.elementa.utils
 
+import gg.essential.elementa.ElementaVersion
 import gg.essential.universal.UGraphics
 import gg.essential.universal.UMatrixStack
 import gg.essential.universal.render.URenderPipeline
@@ -46,7 +47,7 @@ internal fun drawTexture(
         vertexConsumer.pos(matrixStack, x, y, 0.0).tex(0.0, 0.0).color(red, green, blue, alpha).endVertex()
     }
 
-    if (URenderPipeline.isRequired) {
+    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) {

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ open class UIBlock(colorConstraint: ColorConstraint = Color.WHITE.toConstraint()`
`57`	`57`	`drawBlock(UMatrixStack(), color, x1, y1, x2, y2)`
`58`	`58`
`59`	`59`	`fun drawBlock(matrixStack: UMatrixStack, color: Color, x1: Double, y1: Double, x2: Double, y2: Double) {`
`60`		`- if (!URenderPipeline.isRequired) {`
	`60`	`+ if (!URenderPipeline.isRequired && !ElementaVersion.atLeastV9Active) {`
`61`	`61`	`@Suppress("DEPRECATION")`
`62`	`62`	`return drawBlockLegacy(matrixStack, color, x1, y1, x2, y2)`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package gg.essential.elementa.components`
`2`	`2`
	`3`	`+import gg.essential.elementa.ElementaVersion`
`3`	`4`	`import gg.essential.elementa.UIComponent`
`4`	`5`	`import gg.essential.elementa.UIConstraints`
`5`	`6`	`import gg.essential.elementa.constraints.CenterConstraint`
`@@ -118,7 +119,7 @@ constructor(`
`118`	`119`	`return super.draw(matrixStack)`
`119`	`120`	`}`
`120`	`121`
`121`		`- if (!URenderPipeline.isRequired) {`
	`122`	`+ if (!URenderPipeline.isRequired && !ElementaVersion.atLeastV9Active) {`
`122`	`123`	`@Suppress("DEPRECATION")`
`123`	`124`	`UGraphics.enableBlend()`
`124`	`125`	`}`