Better emoji parsing

Author: emyfops

common/src/main/kotlin/com/lambda/core/Loader.kt

@@ -5,7 +5,7 @@ import com.lambda.Lambda.LOG
 import com.lambda.command.CommandRegistry
 import com.lambda.friend.FriendRegistry
 import com.lambda.graphics.renderer.gui.font.LambdaFont
-import com.lambda.graphics.renderer.gui.font.LambdaMoji
+import com.lambda.graphics.renderer.gui.font.LambdaEmoji
 import com.lambda.gui.GuiConfigurable
 import com.lambda.gui.HudGuiConfigurable
 import com.lambda.interaction.PlayerPacketManager
@@ -23,7 +23,7 @@ object Loader {
         RotationManager,
         PlayerPacketManager,
         LambdaFont.Loader,
-        LambdaMoji.Loader,
+        LambdaEmoji.Loader,
         GuiConfigurable,
         HudGuiConfigurable,
         FriendRegistry,

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

@@ -5,6 +5,7 @@ import com.lambda.graphics.buffer.vao.vertex.VertexAttrib
 import com.lambda.graphics.buffer.vao.vertex.VertexMode
 import com.lambda.graphics.renderer.gui.font.glyph.GlyphInfo
 import com.lambda.graphics.shader.Shader
+import com.lambda.module.modules.client.LambdaMoji
 import com.lambda.module.modules.client.RenderSettings
 import com.lambda.util.math.ColorUtils.a
 import com.lambda.util.math.ColorUtils.setAlpha
@@ -13,7 +14,7 @@ import java.awt.Color
 
 class FontRenderer(
     private val font: LambdaFont,
-    private val emojis: LambdaMoji
+    private val emojis: LambdaEmoji
 ) {
     private val vao = VAO(VertexMode.TRIANGLES, VertexAttrib.Group.FONT)
 
@@ -24,7 +25,7 @@ class FontRenderer(
      * Parses the emojis in the given text.
      *
      * @param text The text to parse.
-     * @return A list of pairs containing the glyph info and the range of the emoji in the text.    
+     * @return A list of pairs containing the glyph info and the range of the emoji in the text.
      */
     fun parseEmojis(text: String) =
         mutableListOf<Pair<GlyphInfo, IntRange>>().apply {
@@ -102,36 +103,44 @@ class FontRenderer(
 
         val emojis = parseEmojis(text)
 
-        repeat(text.length) { index ->
-            fun draw(info: GlyphInfo, color: Color, offset: Double = 0.0) {
-                val scaledSize = info.size * actualScale
-                val pos1 = Vec2d(posX, posY) + offset * actualScale
-                val pos2 = pos1 + scaledSize
+        fun draw(info: GlyphInfo, color: Color, offset: Double = 0.0) {
+            val scaledSize = info.size * actualScale
+            val pos1 = Vec2d(posX, posY) + offset * actualScale
+            val pos2 = pos1 + scaledSize
 
-                block(info, pos1, pos2, color)
-                if (offset == 0.0) posX += scaledSize.x + scaledGap
-            }
+            block(info, pos1, pos2, color)
+            if (offset == 0.0) posX += scaledSize.x + scaledGap
+        }
 
-            // Check if there's an emoji
-            emojis.firstOrNull { index in it.second }?.let { emoji ->
-                // Replace first emoji char by an emoji glyph and skip the other ones
-                if (index == emoji.second.first) {
-                    draw(emoji.first, emojiColor)
-                }
+        var index = 0
+        textProcessor@ while (index < text.length) {
+            var innerLoopContact = false // Instead of using BreakContinueInInlineLambdas, we use this
 
-                return@repeat
+            if (LambdaMoji.isEnabled) {
+                // Check if there are emojis to render
+                emojis.firstOrNull { index in it.second }?.let { emoji ->
+                    if (index == emoji.second.first) draw(emoji.first, emojiColor)
+
+                    // Skip the emoji
+                    index = emoji.second.last + 1
+                    innerLoopContact = true
+                }
             }
 
+            if (innerLoopContact) continue@textProcessor
+
             // Render chars
-            font[text[index]]?.let { info ->
-                // Draw a shadow before
-                if (shadow && RenderSettings.shadow && shadowShift > 0.0) {
-                    draw(info, shadowColor, shadowShift)
-                }
+            val charInfo = font[text[index]] ?: continue@textProcessor
 
-                // Draw actual char over the shadow
-                draw(info, color)
+            // Draw a shadow before
+            if (shadow && RenderSettings.shadow && shadowShift > 0.0) {
+                draw(charInfo, shadowColor, shadowShift)
             }
+
+            // Draw actual char over the shadow
+            draw(charInfo, color)
+
+            index++
         }
     }
 

…graphics/renderer/gui/font/LambdaMoji.kt …raphics/renderer/gui/font/LambdaEmoji.ktcommon/src/main/kotlin/com/lambda/graphics/renderer/gui/font/LambdaMoji.kt renamed to common/src/main/kotlin/com/lambda/graphics/renderer/gui/font/LambdaEmoji.kt common/src/main/kotlin/com/lambda/graphics/renderer/gui/font/LambdaMoji.kt renamed to common/src/main/kotlin/com/lambda/graphics/renderer/gui/font/LambdaEmoji.kt

@@ -3,7 +3,7 @@ package com.lambda.graphics.renderer.gui.font
 import com.lambda.core.Loadable
 import com.lambda.graphics.renderer.gui.font.glyph.EmojiGlyphs
 
-enum class LambdaMoji(private val zipUrl: String) {
+enum class LambdaEmoji(private val zipUrl: String) {
     Twemoji("https://github.com/Edouard127/emoji-generator/releases/latest/download/emojis.zip");
 
     lateinit var glyphs: EmojiGlyphs // TODO: Support multiple emoji pools
@@ -16,7 +16,7 @@ enum class LambdaMoji(private val zipUrl: String) {
 
     object Loader : Loadable {
         override fun load(): String {
-            entries.forEach(LambdaMoji::loadGlyphs)
+            entries.forEach(LambdaEmoji::loadGlyphs)
             return "Loaded ${entries.size} emoji pools"
         }
     }

common/src/main/kotlin/com/lambda/gui/api/RenderLayer.kt

@@ -2,7 +2,7 @@ package com.lambda.gui.api
 
 import com.lambda.graphics.renderer.gui.font.FontRenderer
 import com.lambda.graphics.renderer.gui.font.LambdaFont
-import com.lambda.graphics.renderer.gui.font.LambdaMoji
+import com.lambda.graphics.renderer.gui.font.LambdaEmoji
 import com.lambda.graphics.renderer.gui.rect.FilledRectRenderer
 import com.lambda.graphics.renderer.gui.rect.OutlineRectRenderer
 
@@ -11,7 +11,7 @@ class RenderLayer {
     val outline = OutlineRectRenderer()
     val font = FontRenderer(
         LambdaFont.FiraSansRegular,
-        LambdaMoji.Twemoji,
+        LambdaEmoji.Twemoji,
     )
 
     fun render() {

common/src/main/kotlin/com/lambda/module/modules/client/LambdaMoji.kt

@@ -0,0 +1,11 @@
+package com.lambda.module.modules.client
+
+import com.lambda.module.Module
+import com.lambda.module.tag.ModuleTag
+
+object LambdaMoji : Module(
+    name = "LambdaMoji",
+    description = "",
+    defaultTags = setOf(ModuleTag.CLIENT, ModuleTag.RENDER),
+    enabledByDefault = true,
+)