Fix: Emoji parsing

Author: emyfops

common/src/main/kotlin/com/lambda/graphics/renderer/gui/font/FontRenderer.kt

@@ -53,37 +53,47 @@ class FontRenderer(
 
         val emojis = parseEmojis(text)
 
-        val subText = emojis.asReversed().fold(text) { acc, (
-            charInfo, start, end
-        ) ->
-            val emojiSize = charInfo.size * actualScale
-
-            val startPos = Vec2d(posX, posY)
-            val endPos = startPos + emojiSize
-
-            putChar(position, startPos, endPos, color, charInfo)
-
-            posX += emojiSize.x + scaledGap
-
-            acc.replaceRange(start, end, " ")
-        }
+        var index = 0
+        while (index < text.length) {
+            emojis
+                .firstOrNull { index in it.second..it.third }
+                ?.let { emoji ->
+                    val scaledSize = emoji.first.size * actualScale
+                    val pos1 = Vec2d(posX, posY)
+                    val pos2 = pos1 + scaledSize
+
+                    putChar(position, pos1, pos2, color, emoji.first)
+
+                    posX += scaledSize.x + scaledGap
+                    index += emoji.third - emoji.second + 1
+
+                    if (index >= text.length) {
+                        // This means we've reached the end of the text
+                        return@use
+                    }
+                }
+
+            val char = text[index]
+            val glyph = font[char] ?: run {
+                index++
+                return@use
+            }
 
-        subText.toCharArray().forEach { char ->
-            val charInfo = font[char] ?: return@forEach
-            val scaledSize = charInfo.size * actualScale
+            val scaledSize = glyph.size * actualScale
 
             val pos1 = Vec2d(posX, posY)
             val pos2 = pos1 + scaledSize
 
             if (shadow && FontSettings.shadow) {
                 val shadowPos1 = pos1 + scaledShadowShift
                 val shadowPos2 = shadowPos1 + scaledSize
-                putChar(position, shadowPos1, shadowPos2, shadowColor, charInfo)
+                putChar(position, shadowPos1, shadowPos2, shadowColor, glyph)
             }
 
-            putChar(position, pos1, pos2, color, charInfo)
+            putChar(position, pos1, pos2, color, glyph)
 
             posX += scaledSize.x + scaledGap
+            index++
         }
     }
 
@@ -92,19 +102,30 @@ class FontRenderer(
 
         val emojis = parseEmojis(text)
 
-        val subText = emojis.asReversed().fold(text) { acc, (
-            charInfo, start, end
-        ) ->
-            val emojiWidth = charInfo.size.x
-
-            width += emojiWidth + gap
-
-            acc.replaceRange(start, end, " ")
-        }
+        var index = 0
+        while (index < text.length) {
+            emojis
+                .firstOrNull { index in it.second..it.third }
+                ?.let { emoji ->
+                    val scaledSize = emoji.first.size * getScaleFactor(scale)
+                    width += scaledSize.x + gap
+
+                    index += emoji.third - emoji.second + 1
+
+                    if (index >= text.length) {
+                        // This means we've reached the end of the text
+                        return width * getScaleFactor(scale)
+                    }
+                }
+
+            val char = text[index]
+            val glyph = font[char] ?: run {
+                index++
+                return width * getScaleFactor(scale)
+            }
 
-        subText.forEach {
-            val glyph = font[it] ?: return@forEach
-            width += glyph.size.x + gap
+            width += glyph.width + gap
+            index++
         }
 
         return width * getScaleFactor(scale)

common/src/main/kotlin/com/lambda/graphics/renderer/gui/font/glyph/CharInfo.kt

@@ -2,8 +2,16 @@ package com.lambda.graphics.renderer.gui.font.glyph
 
 import com.lambda.util.math.Vec2d
 
-class CharInfo(
+data class CharInfo(
     val size: Vec2d,
     val uv1: Vec2d,
     val uv2: Vec2d
-)
+) {
+    val width get() = size.x
+    val height get() = size.y
+
+    val u1 get() = uv1.x
+    val v1 get() = uv1.y
+    val u2 get() = uv2.x
+    val v2 get() = uv2.y
+}